Kaynağa Gözat

Autogen: Enable per-config support

Enables the AUTOGEN per-config include directories and wrapper sources
for multi configuration generators.

Closes #16460
Sebastian Holtermann 8 yıl önce
ebeveyn
işleme
a13716a5dc

+ 0 - 10
Source/cmQtAutoGeneratorInitializer.cxx

@@ -158,16 +158,6 @@ static void GetCompileDefinitionsAndDirectories(
 
 static bool IsMultiConfig(cmGlobalGenerator* globalGen)
 {
-  // FIXME: Xcode does not support per-config sources, yet.
-  //        (EXCLUDED_SOURCE_FILE_NAMES)
-  //        Treat it as a single configuration generator meanwhile.
-  if (globalGen->GetName().find("Xcode") != std::string::npos) {
-    return false;
-  }
-  // FIXME: Visual Studio does not fully support per-config sources yet.
-  if (globalGen->GetName().find("Visual Studio") != std::string::npos) {
-    return false;
-  }
   return globalGen->IsMultiConfig();
 }
 

+ 3 - 2
Tests/QtAutoUicInterface/CMakeLists.txt

@@ -53,8 +53,9 @@ set_property(TARGET KI18n APPEND PROPERTY
 
 # END upstream
 
-if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
-set(INC_DIR "include_${CMAKE_BUILD_TYPE}" )
+get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(_GENERATOR_IS_MULTI_CONFIG)
+set(INC_DIR "include_$<CONFIG>" )
 else()
 set(INC_DIR "include" )
 endif()