Merge topic 'ctest-remove-cmake-intdir'

db95afce19 Tests/OutDir: Remove stale cache entry on multi-config generators
c6134ca6c7 CTest: Remove usages of CMAKE_INTDIR

Acked-by: Kitware Robot <[email protected]>
Tested-by: buildbot <[email protected]>
Merge-request: !8176

Source/CTest/cmCTestBuildAndTestHandler.cxx

@@ -72,11 +72,6 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
   if (!this->CTest->GetConfigType().empty()) {
     config = this->CTest->GetConfigType().c_str();
   }
-#ifdef CMAKE_INTDIR
-  if (!config) {
-    config = CMAKE_INTDIR;
-  }
-#endif
 
   if (config) {
     args.push_back("-DCMAKE_BUILD_TYPE:STRING=" + std::string(config));
@@ -256,11 +251,6 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
     if (!this->CTest->GetConfigType().empty()) {
       config = this->CTest->GetConfigType().c_str();
     }
-#ifdef CMAKE_INTDIR
-    if (!config) {
-      config = CMAKE_INTDIR;
-    }
-#endif
     if (!config) {
       config = "Debug";
     }

Source/CTest/cmCTestBuildCommand.cxx

@@ -89,11 +89,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
         }
       }
       if (cmakeBuildConfiguration.empty()) {
-#ifdef CMAKE_INTDIR
-        cmakeBuildConfiguration = CMAKE_INTDIR;
-#else
         cmakeBuildConfiguration = "Debug";
-#endif
       }
 
       std::string dir = this->CTest->GetCTestConfiguration("BuildDirectory");

Tests/OutDir/CMakeLists.txt

@@ -7,7 +7,7 @@ if(_isMultiConfig)
     string(TOUPPER "${config}" CONFIG)
     list(APPEND configs "${CONFIG}")
   endforeach()
-  set(CMAKE_BUILD_TYPE)
+  unset(CMAKE_BUILD_TYPE CACHE)
 elseif(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Debug)
 endif()