diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2021-05-24 17:57:40 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2021-05-24 17:57:40 (GMT) |
| commit | bf75369ed40f0adfe687396573b804ae6209161d (patch) | |
| tree | d0641606013b83fcf56438b7d5fe44bd6c8ca4f7 /Source/cmDepends.cxx | |
| parent | 38f2562d5b159cdf7ce4340911c1adb30b3a003e (diff) | |
| parent | c3b9d9b756c84961208ad3086f5f123828fc5400 (diff) | |
| download | CMake-bf75369ed40f0adfe687396573b804ae6209161d.zip CMake-bf75369ed40f0adfe687396573b804ae6209161d.tar.gz CMake-bf75369ed40f0adfe687396573b804ae6209161d.tar.bz2 | |
Merge branch 'master' into cmp0082-exclude-from-all
Diffstat (limited to 'Source/cmDepends.cxx')
| -rw-r--r-- | Source/cmDepends.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index 566c3bf..46c7e3e 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -229,11 +229,10 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends, void cmDepends::SetIncludePathFromLanguage(const std::string& lang) { // Look for the new per "TARGET_" variant first: - cmProp includePath = nullptr; std::string includePathVar = cmStrCat("CMAKE_", lang, "_TARGET_INCLUDE_PATH"); cmMakefile* mf = this->LocalGenerator->GetMakefile(); - includePath = mf->GetDefinition(includePathVar); + cmProp includePath = mf->GetDefinition(includePathVar); if (includePath) { cmExpandList(*includePath, this->IncludePath); } else { |