[cmake-commits] king committed CMakeLists.txt 1.64 1.65
cmTestConfigure.h.in 1.23 1.24
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 19 14:45:44 EDT 2006
Update of /cvsroot/CMake/CMake/Tests/Complex
In directory public:/mounts/ram/cvs-serv2349
Modified Files:
CMakeLists.txt cmTestConfigure.h.in
Log Message:
ENH: Added explicit name for option to test CMakeLib. Added option to disable testing of CMakeLib if system utility libraries are used until linking made easier.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/CMakeLists.txt,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- CMakeLists.txt 5 Oct 2006 16:04:29 -0000 1.64
+++ CMakeLists.txt 19 Oct 2006 18:45:40 -0000 1.65
@@ -4,6 +4,15 @@
SET(CMAKE_BACKWARDS_COMPATIBILITY 1.4)
PROJECT (Complex)
+# Choose whether to test CMakeLib.
+SET(COMPLEX_TEST_CMAKELIB 1)
+IF(CMAKE_TEST_DIFFERENT_GENERATOR)
+ SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(CMAKE_TEST_SYSTEM_LIBRARIES)
+ SET(COMPLEX_TEST_CMAKELIB 0)
+ENDIF(CMAKE_TEST_SYSTEM_LIBRARIES)
+
#
# Define a macro
#
Index: cmTestConfigure.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/cmTestConfigure.h.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmTestConfigure.h.in 22 Sep 2006 15:49:56 -0000 1.23
+++ cmTestConfigure.h.in 19 Oct 2006 18:45:40 -0000 1.24
@@ -4,7 +4,8 @@
#cmakedefine ONE_VAR_IS_DEFINED
#cmakedefine ZERO_VAR
-#cmakedefine CMAKE_TEST_DIFFERENT_GENERATOR
+#cmakedefine COMPLEX_TEST_CMAKELIB
+
#define STRING_VAR "${STRING_VAR}"
// Test FOREACH
More information about the Cmake-commits
mailing list