diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-02 12:02:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-02 12:02:24 (GMT) |
| commit | a432b1075c8808c6e4c925d3f4d4ce94c5477bab (patch) | |
| tree | cbf85da9bdbfdd82e2e0fa6d210478840f82b2da /Source/cmLocalGenerator.cxx | |
| parent | ec7b5f21eef8bc0d6da729aa0f61ddccc7a06f3b (diff) | |
| parent | 7ed8c9ebe33ccafc41ec9e096bf2884d617a0ebf (diff) | |
| download | CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.zip CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.tar.gz CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.tar.bz2 | |
Merge topic 'getdef-expand'
7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4819
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3130e6d..3fca2d4 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1236,11 +1236,10 @@ std::vector<BT<std::string>> cmLocalGenerator::GetIncludeDirectoriesImplicit( // * Compilers like gfortran do not search their own implicit include // directories for modules ('.mod' files). if (lang != "Fortran") { - const char* value = this->Makefile->GetDefinition( - cmStrCat("CMAKE_", lang, "_IMPLICIT_INCLUDE_DIRECTORIES")); - if (value != nullptr) { - size_t const impDirVecOldSize = impDirVec.size(); - cmExpandList(value, impDirVec); + size_t const impDirVecOldSize = impDirVec.size(); + if (this->Makefile->GetDefExpandList( + cmStrCat("CMAKE_", lang, "_IMPLICIT_INCLUDE_DIRECTORIES"), + impDirVec)) { // FIXME: Use cmRange with 'advance()' when it supports non-const. for (size_t i = impDirVecOldSize; i < impDirVec.size(); ++i) { cmSystemTools::ConvertToUnixSlashes(impDirVec[i]); |