summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-08-06 14:59:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-08-06 15:00:12 (GMT)
commit4daf76e10ab3f53b1be15626f0901916dd10885c (patch)
treecc782076c25301f574f1982488ec05fab7f92dc2 /Source/cmGlobalGenerator.cxx
parentfdcb7483d11030fe597208843437ad6cce71ff50 (diff)
parentf76c20da6395c0830ac0de667c105b0b29f84c7a (diff)
downloadCMake-4daf76e10ab3f53b1be15626f0901916dd10885c.zip
CMake-4daf76e10ab3f53b1be15626f0901916dd10885c.tar.gz
CMake-4daf76e10ab3f53b1be15626f0901916dd10885c.tar.bz2
Merge topic 'compiler_flags'
f76c20da63 Toolchain: Test compiler initial settings db486da265 Toolchain: Update documentation for initial compiler flags deec2f587c Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detection ca899af3e2 Toolchain: Handle repeated invocations of CMake with -DCMAKE_C_COMPILER 12ba89e142 Toolchain: Make `/path/comp;-argn' behave the same as 'comp;-argn' 6f1af899db Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILER ec1d3bc0b6 cmake: avoid exception when printing "changed variables" message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4136
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 530bb59..cad5d1f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -235,6 +235,14 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string& lang,
}
cmProp cname =
this->GetCMakeInstance()->GetState()->GetInitializedCacheValue(langComp);
+
+ // Split compiler from arguments
+ std::vector<std::string> cnameArgVec;
+ if (cname && !cname->empty()) {
+ cmExpandList(*cname, cnameArgVec);
+ cname = &cnameArgVec.front();
+ }
+
std::string changeVars;
if (cname && !optional) {
std::string cnameString;