From eb1fdd0f27da1187c13182a7e2f2c40c970de523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Tue, 28 Sep 2010 19:23:15 +0000
Subject: - Reset a few more variables used in FindXYZ scripts. - README.cmake:
 small update. - Set a variable before using it for installation.

svn path=/trunk/; revision=34274
---
 cmake/modules/CheckCLinkerFlag.cmake | 6 +++---
 cmake/modules/FindPCAP.cmake         | 3 +++
 cmake/modules/FindZLIB.cmake         | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'cmake')

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
-- 
cgit v1.2.1