[Cmake-commits] [cmake-commits] king committed CMakeInstall.cmake 1.1.2.2 1.1.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Feb 2 17:10:57 EST 2010
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv13965/Tests
Modified Files:
Tag: CMake-2-8
CMakeInstall.cmake
Log Message:
Avoid CTest 2.6.4 dashboard script crash
CTest 2.6.4 crashes if a dashboard script invokes "message()" after
"ctest_test()" or anything else that creates an inner cmCTest object.
The CMake.Install test drives installation using --build-and-test with
the outer CTest driving CMake tests. We add --force-new-ctest-process
to avoid creation of a cmCTest object inside the outer CTest just in
case it is 2.6.4.
Index: CMakeInstall.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeInstall.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** CMakeInstall.cmake 28 Jan 2010 21:48:04 -0000 1.1.2.2
--- CMakeInstall.cmake 2 Feb 2010 22:10:55 -0000 1.1.2.3
***************
*** 34,37 ****
--- 34,38 ----
${CMake_TEST_INSTALL_CTest}
${CMake_TEST_INSTALL_CONFIG}
+ --force-new-ctest-process
--build-and-test ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
--build-generator ${CMAKE_GENERATOR} # Not CMAKE_TEST_GENERATOR
More information about the Cmake-commits
mailing list