[cmake-commits] alex committed CTest.cmake 1.7 1.7.4.1 DartConfiguration.tcl.in 1.6 1.6.10.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	CTest.cmake DartConfiguration.tcl.in 
Log Message:

ENH: allow it to set UPDATE_TYPE via CTEST_UPDATE_TYPE from
CTestConfig.cmake
-add EXECUTABLE_SUFFIX to DartConfig.tcl so it can be used in ctest
-use CPACK_EXECUTABLE_SUFFIX for cpack (strip, which doesn't work because of the install dir)

Alex


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -d -r1.7 -r1.7.4.1
--- CTest.cmake	28 Jun 2006 19:15:01 -0000	1.7
+++ CTest.cmake	11 May 2007 17:46:01 -0000	1.7.4.1
@@ -38,6 +38,7 @@
     SET_IF_SET_AND_NOT_SET(DROP_SITE_MODE "${CTEST_DROP_SITE_MODE}")
     SET_IF_SET_AND_NOT_SET(DROP_LOCATION "${CTEST_DROP_LOCATION}")
     SET_IF_SET_AND_NOT_SET(TRIGGER_SITE "${CTEST_TRIGGER_SITE}")
+    SET_IF_SET_AND_NOT_SET(UPDATE_TYPE "${CTEST_UPDATE_TYPE}")
   ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake")
 
   # the project can have a DartConfig.cmake file
@@ -45,6 +46,8 @@
     INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake")
   ELSE(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake")
 
+    SET_IF_NOT_SET(EXECUTABLE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}")
+
     # Dashboard is opened for submissions for a 24 hour period starting at
     # the specified NIGHTLY_START_TIME. Time is specified in 24 hour format.
     SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT")

Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.6
retrieving revision 1.6.10.1
diff -u -d -r1.6 -r1.6.10.1
--- DartConfiguration.tcl.in	16 Feb 2005 18:30:17 -0000	1.6
+++ DartConfiguration.tcl.in	11 May 2007 17:46:01 -0000	1.6.10.1
@@ -30,6 +30,9 @@
 ConfigureCommand: "@CMAKE_COMMAND@" "@PROJECT_SOURCE_DIR@"
 MakeCommand: @MAKECOMMAND@
 
+# Support for different executable suffixes
+ExecutableSuffix: @EXECUTABLE_SUFFIX@
+
 # CVS options
 # Default is "-d -P -A"
 CVSCommand: @CVSCOMMAND@