diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-24 17:18:49 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-24 17:18:49 (GMT) |
| commit | 205855bf56656956a3004f603be4dadb2335657a (patch) | |
| tree | 2ba83db5a52028dfb226e271b8d810c5660dbbdf /Tests/CTestTestParallel | |
| parent | 2e5ccdbc182e7f9f6243a62990b20efe5675723b (diff) | |
| download | CMake-205855bf56656956a3004f603be4dadb2335657a.zip CMake-205855bf56656956a3004f603be4dadb2335657a.tar.gz CMake-205855bf56656956a3004f603be4dadb2335657a.tar.bz2 | |
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.
Diffstat (limited to 'Tests/CTestTestParallel')
| -rw-r--r-- | Tests/CTestTestParallel/test.cmake.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Tests/CTestTestParallel/test.cmake.in b/Tests/CTestTestParallel/test.cmake.in index 4c41c6a..876d7fa 100644 --- a/Tests/CTestTestParallel/test.cmake.in +++ b/Tests/CTestTestParallel/test.cmake.in @@ -8,7 +8,9 @@ SET(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Parallel") SET(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestParallel") SET(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestParallel") SET(CTEST_CVS_COMMAND "@CVSCOMMAND@") -SET(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") +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@") SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@") @@ -19,12 +21,9 @@ SET(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIP #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY}) 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@ +CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@ +CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@ +MAKECOMMAND:STRING=@MAKECOMMAND@ ") CTEST_START(Experimental) |