[Cmake-commits] [cmake-commits] king committed CTest.cmake 1.13 1.14 DartConfiguration.tcl.in 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	CTest.cmake DartConfiguration.tcl.in 
Log Message:
ENH: Create include(CTest) launcher interface

This defines a new CTest configuration variable CTEST_USE_LAUNCHERS.
When set to true it puts 'ctest --launch' in RULE_LAUNCH_* properties
and enables the CTest configuration option 'UseLaunchers'.  Currently
this works only for Makefile generators.


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** CTest.cmake	3 Nov 2008 21:23:43 -0000	1.13
--- CTest.cmake	11 Feb 2009 20:18:13 -0000	1.14
***************
*** 191,194 ****
--- 191,206 ----
    BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} )
  
+   IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
+     SET(CTEST_USE_LAUNCHERS 0)
+   ENDIF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
+   IF(CTEST_USE_LAUNCHERS)
+     SET(CTEST_LAUNCH_COMPILE "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <OBJECT> --source <SOURCE> --language <LANGUAGE> --")
+     SET(CTEST_LAUNCH_LINK    "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <TARGET> --target-type <TARGET_TYPE> --language <LANGUAGE> --")
+     SET(CTEST_LAUNCH_CUSTOM  "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <OUTPUT> --")
+     SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CTEST_LAUNCH_COMPILE}")
+     SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CTEST_LAUNCH_LINK}")
+     SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "${CTEST_LAUNCH_CUSTOM}")
+   ENDIF(CTEST_USE_LAUNCHERS)
+ 
    MARK_AS_ADVANCED(
      COVERAGE_COMMAND

Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** DartConfiguration.tcl.in	29 Feb 2008 19:58:33 -0000	1.7
--- DartConfiguration.tcl.in	11 Feb 2009 20:18:13 -0000	1.8
***************
*** 61,62 ****
--- 61,64 ----
  # Currently set to 25 minutes
  TimeOut: @DART_TESTING_TIMEOUT@
+ 
+ UseLaunchers: @CTEST_USE_LAUNCHERS@