[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.28 1.97.2.29 ChangeLog.manual 1.1.8.32 1.1.8.33

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: check in fixes from main tree to create 2.4.7 RC 5


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.28
retrieving revision 1.97.2.29
diff -u -d -r1.97.2.28 -r1.97.2.29
--- CMakeLists.txt	15 Feb 2007 18:36:08 -0000	1.97.2.28
+++ CMakeLists.txt	16 Mar 2007 22:05:42 -0000	1.97.2.29
@@ -7,7 +7,7 @@
 SET(CMake_VERSION_MINOR 4)
 SET(CMake_VERSION_PATCH 7)
 # for an actual release this should not be defined
-SET(CMake_VERSION_RC 4)
+SET(CMake_VERSION_RC 5)
 SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 
@@ -432,3 +432,45 @@
   "${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)

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.32
retrieving revision 1.1.8.33
diff -u -d -r1.1.8.32 -r1.1.8.33
--- ChangeLog.manual	15 Feb 2007 18:36:08 -0000	1.1.8.32
+++ ChangeLog.manual	16 Mar 2007 22:05:42 -0000	1.1.8.33
@@ -1,4 +1,23 @@
 Changes in CMake 2.4.7
+
+* Fix for bug# 4423, LANGUAGE property now works in VS IDE
+
+* Fix for RUN_TESTS running the tests twice in VS IDE
+
+* Do not create import libraries for modules on borland
+
+* Fix for FILE(RELATIVE_PATH) # 4482
+
+* Fix for apple lack of support for isystem flag
+
+* Fix for Borland skipping make rules with no depends
+
+* Fix for bug #4423 set source file properties LANGUAGE not always working
+
+* Fix for bug #4462 isystem not supported on OSX
+
+* Fix bug in save of resize of CMakeSetup
+
 * Fix for @@ in file names
 
 * Fix for if command scope issues
@@ -297,7 +316,7 @@
 
 * Add target/fast rules in the sub directories
 
-* Fix Visual stuido C and C++ targets to not add /TP and /TC
+* Fix Visual studio C and C++ targets to not add /TP and /TC
 
 * print a context when cmake errors occur