summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-07 15:08:05 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-06-07 15:08:13 (GMT)
commit67c0b56e3c31422f546a963a0d571b85c98534a0 (patch)
treee00e3bade39bfe196a9fa9d64bf6235a5fbb89bd /Source
parent5b1d0aeffe337e8109d267d88f7533807fb76c31 (diff)
parentcc1b513df143161e437c261cc385225cb4191d16 (diff)
downloadCMake-67c0b56e3c31422f546a963a0d571b85c98534a0.zip
CMake-67c0b56e3c31422f546a963a0d571b85c98534a0.tar.gz
CMake-67c0b56e3c31422f546a963a0d571b85c98534a0.tar.bz2
Merge topic 'autogen-no-vs-per-config'
cc1b513d Autogen: Do not use per-config file suffixes with VS yet Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !932
Diffstat (limited to 'Source')
-rw-r--r--Source/cmQtAutoGeneratorInitializer.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index a39c10b..6924ba2 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -162,6 +162,10 @@ static bool IsMultiConfig(cmGlobalGenerator* globalGen)
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();
}