diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-09-08 04:32:04 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-09-08 11:34:29 +0000 |
| commit | df21aa90250c29d7466d55d9e0eda2cddd0dfbd8 (patch) | |
| tree | e5fdd84a9b01114bedd293c534d161a64ee77f69 /cmake | |
| parent | 935c055c18c8e33021c4062d22d4b87fe5577662 (diff) | |
Use cmake_push_check_state() and cmake_pop_check_state().
Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5
Reviewed-on: https://code.wireshark.org/review/23435
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGEOIP.cmake | 5 | ||||
| -rw-r--r-- | cmake/modules/FindPORTAUDIO.cmake | 5 | ||||
| -rw-r--r-- | cmake/modules/FindZLIB.cmake | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/cmake/modules/FindGEOIP.cmake b/cmake/modules/FindGEOIP.cmake index a8e671f4ce..2c1065c9da 100644 --- a/cmake/modules/FindGEOIP.cmake +++ b/cmake/modules/FindGEOIP.cmake @@ -39,6 +39,8 @@ INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOIP DEFAULT_MSG GEOIP_LIBRARY GEOIP_INCLUDE_DIR) IF(GEOIP_FOUND) + INCLUDE(CMakePushCheckState) + CMAKE_PUSH_CHECK_STATE() SET(GEOIP_LIBRARIES ${GEOIP_LIBRARY} ) SET(GEOIP_INCLUDE_DIRS ${GEOIP_INCLUDE_DIR} ) INCLUDE(CheckFunctionExists) @@ -46,8 +48,7 @@ IF(GEOIP_FOUND) SET(CMAKE_REQUIRED_LIBRARIES ${GEOIP_LIBRARIES}) CHECK_FUNCTION_EXISTS("GeoIP_country_name_by_ipnum_v6" HAVE_GEOIP_V6) CHECK_FUNCTION_EXISTS("GeoIP_free" HAVE_GEOIP_FREE) - SET(CMAKE_REQUIRED_INCLUDES "") - SET(CMAKE_REQUIRED_LIBRARIES "") + CMAKE_POP_CHECK_STATE() if (WIN32) set ( GEOIP_DLL_DIR "${GEOIP_HINTS}/bin" CACHE PATH "Path to the GeoIP DLL" diff --git a/cmake/modules/FindPORTAUDIO.cmake b/cmake/modules/FindPORTAUDIO.cmake index a8676b8202..d8f27d38e1 100644 --- a/cmake/modules/FindPORTAUDIO.cmake +++ b/cmake/modules/FindPORTAUDIO.cmake @@ -61,12 +61,13 @@ IF(PORTAUDIO_FOUND) # We only have the newer version on Windows SET( PORTAUDIO_API_1 ) ELSE(WIN32) + INCLUDE(CMakePushCheckState) INCLUDE(CheckFunctionExists) + CMAKE_PUSH_CHECK_STATE() SET(CMAKE_REQUIRED_INCLUDES ${PORTAUDIO_INCLUDE_DIRS}) SET(CMAKE_REQUIRED_LIBRARIES ${PORTAUDIO_LIBRARIES}) CHECK_FUNCTION_EXISTS(Pa_GetVersion HAVE_PA_GETVERSION) - SET(CMAKE_REQUIRED_INCLUDES "") - SET(CMAKE_REQUIRED_LIBRARIES "") + CMAKE_POP_CHECK_STATE() IF(HAVE_PA_GETVERSION) # Symbol found, must be the newer V19 API SET( PORTAUDIO_API_1 ) diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index 34fb1bb608..91b1270d01 100644 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -100,7 +100,9 @@ IF(WIN32) MESSAGE(STATUS "Zlib might not be built yet; assume it contains inflatePrime") SET(HAVE_INFLATEPRIME ON) ELSE() + INCLUDE(CMakePushCheckState) INCLUDE(CheckFunctionExists) + CMAKE_PUSH_CHECK_STATE() SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) # # Check for inflate() in zlib, to make sure the zlib library is @@ -120,7 +122,7 @@ ELSE() ENDIF() CHECK_FUNCTION_EXISTS("inflatePrime" HAVE_INFLATEPRIME) # reset - SET(CMAKE_REQUIRED_LIBRARIES "") + CMAKE_POP_CHECK_STATE() ENDIF() # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if |