summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestBuildAndTestHandler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest/cmCTestBuildAndTestHandler.cxx')
-rw-r--r--Source/CTest/cmCTestBuildAndTestHandler.cxx10
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)
{