[cmake-commits] martink committed CMakeLists.txt 1.114 1.115

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv1273

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: allow system information to accept the -G option


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- CMakeLists.txt	27 Feb 2007 18:04:29 -0000	1.114
+++ CMakeLists.txt	28 Feb 2007 17:25:19 -0000	1.115
@@ -430,7 +430,51 @@
   "${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
   @ONLY IMMEDIATE)
 
+# Testing
+IF (NOT DART_ROOT)
+  SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
+ENDIF (NOT DART_ROOT)
+
+IF(BUILD_TESTING)
+  SET(CMAKE_TEST_GENERATOR "" CACHE STRING "Generator used when running tests")
+  SET(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH "Generator used when running tests")
+  IF(NOT CMAKE_TEST_GENERATOR)
+    SET(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}")
+    SET(CMAKE_TEST_MAKEPROGRAM "${MAKEPROGRAM}")
+  ELSE(NOT CMAKE_TEST_GENERATOR)
+    SET(CMAKE_TEST_DIFFERENT_GENERATOR TRUE)
+  ENDIF(NOT CMAKE_TEST_GENERATOR)
+
+  # Are we testing with the MSVC compiler?
+  SET(CMAKE_TEST_MSVC 0)
+  IF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+    SET(CMAKE_TEST_MSVC 1)
+  ELSE(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+    IF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
+        "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
+      SET(CMAKE_TEST_MSVC 1)
+    ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
+      "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
+  ENDIF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+
+  SET(CMAKE_TEST_SYSTEM_LIBRARIES 0)
+  FOREACH(util CURL EXPAT XMLRPC ZLIB)
+    IF(CMAKE_USE_SYSTEM_${util})
+      SET(CMAKE_TEST_SYSTEM_LIBRARIES 1)
+    ENDIF(CMAKE_USE_SYSTEM_${util})
+  ENDFOREACH(util)
+
+  # This variable is set by cmake, however to
+  # test cmake we want to make sure that
+  # the ctest from this cmake is used for testing
+  # and not the ctest from the cmake building and testing
+  # cmake.
+  SET(CMAKE_CTEST_COMMAND "${EXECUTABLE_OUTPUT_PATH}/ctest")
+  SET(CMAKE_CMAKE_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cmake")
+ENDIF(BUILD_TESTING)
+
 ADD_TEST(SystemInformationNew 
-  "${EXECUTABLE_OUTPUT_PATH}/cmake" --system-information
+  "${CMAKE_CMAKE_COMMAND}" --system-information
+  -G "${CMAKE_TEST_GENERATOR}"
   )