diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-15 12:19:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-15 12:19:51 (GMT) |
| commit | 3411c815752470432d56c7bf265d9f99d174d082 (patch) | |
| tree | b1afd78541d35b7bc5bfb12f4023cc4d9110054b /Source | |
| parent | a2a903fe42f6ef54665135cac54b75d50bcd696c (diff) | |
| parent | cde2596a19861e52d6ef0f98dcc0b70ba572573e (diff) | |
| download | CMake-3411c815752470432d56c7bf265d9f99d174d082.zip CMake-3411c815752470432d56c7bf265d9f99d174d082.tar.gz CMake-3411c815752470432d56c7bf265d9f99d174d082.tar.bz2 | |
Merge topic 'try_compile-expand-compile-defs'
cde2596a19 try_compile: Restore expansion of ;-list in COMPILE_DEFINITIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2965
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index bd110ec..eb52895 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -226,7 +226,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv, } else if (doing == DoingCMakeFlags) { cmakeFlags.push_back(argv[i]); } else if (doing == DoingCompileDefinitions) { - compileDefs.push_back(argv[i]); + cmSystemTools::ExpandListArgument(argv[i], compileDefs); } else if (doing == DoingLinkOptions) { linkOptions.push_back(argv[i]); } else if (doing == DoingLinkLibraries) { |