kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2008-09-04 11:31:10 -04:00
parent 34b5a8ff11
commit 810c47f56e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/CTest/cmCTestBuildAndTestHandler.cxx
View File

@ -79,7 +79,10 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
config = this->CTest->GetConfigType().c_str(); config = this->CTest->GetConfigType().c_str();
} }
#ifdef CMAKE_INTDIR #ifdef CMAKE_INTDIR
config = CMAKE_INTDIR; if(!config)
{
config = CMAKE_INTDIR;
}
#endif #endif
if ( config ) if ( config )
@ -259,7 +262,10 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
config = this->CTest->GetConfigType().c_str(); config = this->CTest->GetConfigType().c_str();
} }
#ifdef CMAKE_INTDIR #ifdef CMAKE_INTDIR
config = CMAKE_INTDIR; if(!config)
{
config = CMAKE_INTDIR;
}
#endif #endif
if(!config) if(!config)
{ {