[Cmake-commits] [cmake-commits] david.cole committed CTest.cmake 1.20 1.21 DartConfiguration.tcl.in 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	CTest.cmake DartConfiguration.tcl.in 
Log Message:
Fix issue #2336 - honor the -C arg to ctest. Honor it for all stages of running -D dashboards from the command line and running ctest_configure, ctest_build and ctest_test commands in -S scripts. Also, allow a script to change it by setting the CTEST_CONFIGURATION_TYPE variable: allows for multiple configuration build/test cycles within one script. Add a new signature for the cmake command build_command that accepts CONFIGURATION as one argument. The original build_command signature is still there, but now marked as deprecated in the documentation. Of course... also add CTestConfig tests to verify that -C is honored for -D dashboards and -S scripts.


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** CTest.cmake	28 Sep 2009 15:46:50 -0000	1.20
--- CTest.cmake	4 Dec 2009 17:08:54 -0000	1.21
***************
*** 85,92 ****
    SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")
  
-   # make program just needs to use CMAKE_MAKE_PROGRAM which is required
-   # to be defined by cmake 
-   SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
- 
    FIND_PROGRAM(CVSCOMMAND cvs )
    SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING 
--- 85,88 ----
***************
*** 203,208 ****
      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
    ENDIF(NOT BUILDNAME)
!   # set the build command
!   BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} )
  
    IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")
--- 199,213 ----
      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
    ENDIF(NOT BUILDNAME)
! 
!   # the build command
!   BUILD_COMMAND(MAKECOMMAND CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}")
!   SET(MAKECOMMAND ${MAKECOMMAND} CACHE STRING "Command to build the project")
! 
!   # the default build configuration the ctest build handler will use
!   # if there is no -C arg given to ctest:
!   SET(DEFAULT_CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
!   IF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "")
!     SET(DEFAULT_CTEST_CONFIGURATION_TYPE "Release")
!   ENDIF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "")
  
    IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make")

Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** DartConfiguration.tcl.in	12 Oct 2009 15:06:42 -0000	1.12
--- DartConfiguration.tcl.in	4 Dec 2009 17:08:55 -0000	1.13
***************
*** 31,34 ****
--- 31,35 ----
  ConfigureCommand: "@CMAKE_COMMAND@" "@PROJECT_SOURCE_DIR@"
  MakeCommand: @MAKECOMMAND@
+ DefaultCTestConfigurationType: @DEFAULT_CTEST_CONFIGURATION_TYPE@
  
  # CVS options