diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-05 12:37:03 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-05 12:37:03 (GMT) |
| commit | a13716a5dc1277d46beebffe6304214c22cf6ae3 (patch) | |
| tree | 2571506b375c86c1fb9da4dd45ae374ade82fdde | |
| parent | 6d83757f2620413918f76de975cd38efa3157416 (diff) | |
| download | CMake-a13716a5dc1277d46beebffe6304214c22cf6ae3.zip CMake-a13716a5dc1277d46beebffe6304214c22cf6ae3.tar.gz CMake-a13716a5dc1277d46beebffe6304214c22cf6ae3.tar.bz2 | |
Autogen: Enable per-config support
Enables the AUTOGEN per-config include directories and wrapper sources
for multi configuration generators.
Closes #16460
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 10 | ||||
| -rw-r--r-- | Tests/QtAutoUicInterface/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 1c0d4c3..5a06730 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/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(); } diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutoUicInterface/CMakeLists.txt index 3ea1294..a5c2d99 100644 --- a/Tests/QtAutoUicInterface/CMakeLists.txt +++ b/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() |