summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-07 14:01:18 (GMT)
committerBrad King <brad.king@kitware.com>2017-06-07 14:01:18 (GMT)
commitb9d411eb258476a0eb603ac078b01b335661714a (patch)
treeead8bd1e3a641504116014403873c2d971c676a2 /Source
parent5f8271962b3498ba0e2cb3756afa8f785b275e78 (diff)
parentcc1b513df143161e437c261cc385225cb4191d16 (diff)
downloadCMake-b9d411eb258476a0eb603ac078b01b335661714a.zip
CMake-b9d411eb258476a0eb603ac078b01b335661714a.tar.gz
CMake-b9d411eb258476a0eb603ac078b01b335661714a.tar.bz2
Merge branch 'autogen-no-vs-per-config' into release-3.9
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();
}