[Cmake-commits] [cmake-commits] hoffman committed test.cmake.in 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Sep 24 13:18:51 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/CTestTestCrash
In directory public:/mounts/ram/cvs-serv12380/CTestTestCrash
Modified Files:
test.cmake.in
Log Message:
Make sure CTestTest scripts honor the CMAKE_TEST_GENERATOR so that if the generator to build cmake is different than the one used for tests (watcom) is used.
Index: test.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestCrash/test.cmake.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** test.cmake.in 18 Sep 2009 16:16:36 -0000 1.1
--- test.cmake.in 24 Sep 2009 17:18:49 -0000 1.2
***************
*** 9,13 ****
SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestCrash")
SET(CTEST_CVS_COMMAND "@CVSCOMMAND@")
! SET(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
SET(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@")
--- 9,15 ----
SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestCrash")
SET(CTEST_CVS_COMMAND "@CVSCOMMAND@")
! SET(CMAKE_TEST_MAKEPROGRAM "@CMAKE_TEST_MAKEPROGRAM@")
! SET(MAKECOMMAND "@MAKECOMMAND@")
! SET(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@")
SET(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@")
***************
*** 21,30 ****
FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
! CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
! CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
! CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
! CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
! CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
! CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
")
--- 23,29 ----
FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
! CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
! CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
! MAKECOMMAND:STRING=@MAKECOMMAND@
")
More information about the Cmake-commits
mailing list