[cmake-commits] hoffman committed CMakeLists.txt 1.59.2.9 1.59.2.10 cmTestConfigure.h.in 1.22.2.3 1.22.2.4

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Oct 27 16:01:55 EDT 2006


Update of /cvsroot/CMake/CMake/Tests/Complex
In directory public:/mounts/ram/cvs-serv22632/Tests/Complex

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt cmTestConfigure.h.in 
Log Message:
ENH: move changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/CMakeLists.txt,v
retrieving revision 1.59.2.9
retrieving revision 1.59.2.10
diff -u -d -r1.59.2.9 -r1.59.2.10
--- CMakeLists.txt	13 Oct 2006 14:52:08 -0000	1.59.2.9
+++ CMakeLists.txt	27 Oct 2006 20:01:53 -0000	1.59.2.10
@@ -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.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- cmTestConfigure.h.in	13 Oct 2006 14:52:08 -0000	1.22.2.3
+++ cmTestConfigure.h.in	27 Oct 2006 20:01:53 -0000	1.22.2.4
@@ -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