From: Andres Mejia Date: Fri, 1 Feb 2013 21:52:21 +0000 (-0500) Subject: Set use of /SAFESEH linker flag for all LIBARCHIVE_CHECK_C_SOURCE_* checks. X-Git-Tag: v3.1.2~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3d1434212f6b644398cd67fb70e9b4ac86fdbc6;p=thirdparty%2Flibarchive.git Set use of /SAFESEH linker flag for all LIBARCHIVE_CHECK_C_SOURCE_* checks. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 200fd8a27..d5d3c99c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,10 +172,12 @@ IF(MSVC) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH") SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH") + SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH") ELSEIF(ENABLE_SAFESEH STREQUAL "NO") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") + SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH:NO") ENDIF(ENABLE_SAFESEH STREQUAL "YES") ENDIF(MSVC) @@ -239,13 +241,6 @@ MACRO (TRY_MACRO_FOR_LIBRARY INCLUDES LIBRARIES CMAKE_PUSH_CHECK_STATE() # Save the state of the variables SET(CMAKE_REQUIRED_INCLUDES ${INCLUDES}) SET(CMAKE_REQUIRED_LIBRARIES ${LIBRARIES}) - IF(MSVC) - IF(ENABLE_SAFESEH STREQUAL "YES") - SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH") - ELSEIF(ENABLE_SAFESEH STREQUAL "NO") - SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH:NO") - ENDIF(ENABLE_SAFESEH STREQUAL "YES") - ENDIF(MSVC) FOREACH(VAR ${MACRO_LIST}) # Clear ${VAR} from CACHE If the libraries which ${VAR} was # checked with are changed.