summaryrefslogtreecommitdiffstats
path: root/Source/cmCoreTryCompile.cxx
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2019-08-16 18:50:52 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-16 18:51:03 (GMT)
commit2beed5a4ef66f415f4efa327a8c479395d262e52 (patch)
tree48b1a8ad1a2fe87cb6a84de2b96379ebd7f78674 /Source/cmCoreTryCompile.cxx
parentdcf2beb7dec757b7e28eba43fb7f2d5498bded39 (diff)
parent2f6495e24e57cd4a03f38e615cc60177e89afb96 (diff)
downloadCMake-2beed5a4ef66f415f4efa327a8c479395d262e52.zip
CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.gz
CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.bz2
Merge topic 'cmExpandList'
2f6495e24e cmSystemTools: Remove ExpandListArgument methods f4f3c68926 Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument ff42dec891 cmStringAlgorithms: Add cmExpandList functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3682
Diffstat (limited to 'Source/cmCoreTryCompile.cxx')
-rw-r--r--Source/cmCoreTryCompile.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 85ff0a6..c0c4a25 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -234,7 +234,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
} else if (doing == DoingCMakeFlags) {
cmakeFlags.push_back(argv[i]);
} else if (doing == DoingCompileDefinitions) {
- cmSystemTools::ExpandListArgument(argv[i], compileDefs);
+ cmExpandList(argv[i], compileDefs);
} else if (doing == DoingLinkOptions) {
linkOptions.push_back(argv[i]);
} else if (doing == DoingLinkLibraries) {
@@ -676,7 +676,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
if (const char* varListStr = this->Makefile->GetDefinition(
kCMAKE_TRY_COMPILE_PLATFORM_VARIABLES)) {
std::vector<std::string> varList;
- cmSystemTools::ExpandListArgument(varListStr, varList);
+ cmExpandList(varListStr, varList);
vars.insert(varList.begin(), varList.end());
}