diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-28 19:23:15 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-28 19:23:15 +0000 |
| commit | 42c56485dcfb49d116c06dec8be8b28088a7f4a2 (patch) | |
| tree | 689ea3436cf43652107cc8368407fb93271db52e /cmake/modules | |
| parent | 827de6ab6001a89938050fa534775855e945ff98 (diff) | |
- Reset a few more variables used in FindXYZ scripts.
- README.cmake: small update.
- Set a variable before using it for installation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34274 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/CheckCLinkerFlag.cmake | 6 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 3 | ||||
| -rw-r--r-- | cmake/modules/FindZLIB.cmake | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cmake/modules/CheckCLinkerFlag.cmake b/cmake/modules/CheckCLinkerFlag.cmake index aa346684f7..abe4a3a283 100644 --- a/cmake/modules/CheckCLinkerFlag.cmake +++ b/cmake/modules/CheckCLinkerFlag.cmake @@ -12,12 +12,12 @@ # # Redistribution and use is allowed according to the terms of the BSD license. -INCLUDE(CheckCSourceCompiles) +INCLUDE(CheckCSourceRuns) MACRO (CHECK_C_LINKER_FLAG _FLAG _RESULT) SET(CMAKE_REQUIRED_FLAGS "${_FLAG}") message(status "check linker flag - test linker flags: ${CMAKE_REQUIRED_FLAGS}") - CHECK_C_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}) - SET(CMAKE_REQUIRED_FLAGS " ") + CHECK_C_SOURCE_RUNS("int main() { return 0;}" ${_RESULT}) + SET(CMAKE_REQUIRED_FLAGS "") ENDMACRO (CHECK_C_LINKER_FLAG) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 1ec01c95c6..d22f0ba951 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -120,6 +120,9 @@ CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK) CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION) CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD) CHECK_FUNCTION_EXISTS("pcap_free_datalinks" HAVE_PCAP_FREE_DATALINKS) +# reset vars +SET(CMAKE_REQUIRED_INCLUDES "") +SET(CMAKE_REQUIRED_LIBRARIES "") INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCAP DEFAULT_MSG PCAP_INCLUDE_DIRS PCAP_LIBRARIES) diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index 5f8f24b587..316f9e5115 100644 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -38,6 +38,8 @@ SET(ZLIB_LIBRARIES "${ZLIB_LIBRARY}") INCLUDE(CheckFunctionExists) SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) CHECK_FUNCTION_EXISTS("gzclearerr" HAVE_GZCLEARERR) +# reset +SET(CMAKE_REQUIRED_LIBRARIES "") # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if # all listed variables are TRUE |