diff options
| author | Brad King <brad.king@kitware.com> | 2008-09-04 15:31:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-09-04 15:31:10 (GMT) |
| commit | 810c47f56e0bde46c163943609f7e0464e6287fd (patch) | |
| tree | 4d52c684e9d4a561d09e2b8cfd0dbcad7ed9e2ef /Source/CTest/cmCTestBuildAndTestHandler.cxx | |
| parent | 34b5a8ff1141eec30e3dc8d714ae496d09e15248 (diff) | |
| download | CMake-810c47f56e0bde46c163943609f7e0464e6287fd.zip CMake-810c47f56e0bde46c163943609f7e0464e6287fd.tar.gz CMake-810c47f56e0bde46c163943609f7e0464e6287fd.tar.bz2 | |
BUG: Make CTest honor user-specified config
When the -C or --build-config option is used to specify the
configuration to be tested by CTest, do not override it with the
configuration in which CTest is built.
Diffstat (limited to 'Source/CTest/cmCTestBuildAndTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index ccd4ec1..cb713a6 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -79,7 +79,10 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, config = this->CTest->GetConfigType().c_str(); } #ifdef CMAKE_INTDIR - config = CMAKE_INTDIR; + if(!config) + { + config = CMAKE_INTDIR; + } #endif if ( config ) @@ -259,7 +262,10 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) config = this->CTest->GetConfigType().c_str(); } #ifdef CMAKE_INTDIR - config = CMAKE_INTDIR; + if(!config) + { + config = CMAKE_INTDIR; + } #endif if(!config) { |