[cmake-commits] martink committed CMakeLists.txt 1.352 1.353 ctest.cxx 1.93 1.94

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Mar 19 12:04:12 EST 2007


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

Modified Files:
	CMakeLists.txt ctest.cxx 
Log Message:
ENH: support for --build-config-sample feature #1022


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -r1.352 -r1.353
--- CMakeLists.txt	8 Mar 2007 18:13:58 -0000	1.352
+++ CMakeLists.txt	19 Mar 2007 17:04:10 -0000	1.353
@@ -653,11 +653,12 @@
     SET(COMPILER_IS_COMO 1)
   ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
   IF(NOT COMPILER_IS_COMO)
-    ADD_TEST(complex   ${CMAKE_CTEST_COMMAND}
+    ADD_TEST(complex  ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/Complex"
       "${CMake_BINARY_DIR}/Tests/Complex"
       --build-two-config
+      --build-config-sample "${CMAKE_CTEST_COMMAND}"
       --build-generator ${CMAKE_TEST_GENERATOR}
       --build-project Complex
       --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- ctest.cxx	30 Jan 2007 16:35:17 -0000	1.93
+++ ctest.cxx	19 Mar 2007 17:04:10 -0000	1.94
@@ -162,6 +162,10 @@
   {"--build-project", "Specify the name of the project to build.", "" },
   {"--build-makeprogram", "Specify the make program to use.", "" },
   {"--build-noclean", "Skip the make clean step.", "" },
+  {"--build-config-sample", 
+   "A sample executable to use to determine the configuraiton", 
+   "A sample executable to use to determine the configuraiton that "
+   "should be used. e.g. Debug/Release/etc" },
   {"--build-options", "Add extra options to the build step.",
    "This option must be the last option with the exception of --test-command"
   },



More information about the Cmake-commits mailing list