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:
parent
34b5a8ff11
commit
810c47f56e
|
@ -79,7 +79,10 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
|
|||
config = this->CTest->GetConfigType().c_str();
|
||||
}
|
||||
#ifdef 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
|
||||
if(!config)
|
||||
{
|
||||
config = CMAKE_INTDIR;
|
||||
}
|
||||
#endif
|
||||
if(!config)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue