diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-25 13:34:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-25 13:34:24 (GMT) |
| commit | 916d52533ea354d8945c0cba44f65ee34d0e7cd5 (patch) | |
| tree | 542f15a19985aea192718b20c44bf04782a4140a /Source/cmMakefile.cxx | |
| parent | 8cd007fee664e4c7d1e3a1e50dba5b3fe973e3cf (diff) | |
| parent | c13408279f035c8261b530e26040cf4b8f01fdab (diff) | |
| download | CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.zip CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.tar.gz CMake-916d52533ea354d8945c0cba44f65ee34d0e7cd5.tar.bz2 | |
Merge topic 'standard-include-directories'
c1340827 Add a variable to specify language-wide system include directories
44199097 cmMakefile: Optimize AddSystemIncludeDirectories for empty set
a896043b GHS: Compute include directories consistently with other generators
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7e99f2c..e684689 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1574,6 +1574,10 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string>& incs, void cmMakefile::AddSystemIncludeDirectories(const std::set<std::string>& incs) { + if (incs.empty()) { + return; + } + this->SystemIncludeDirectories.insert(incs.begin(), incs.end()); for (cmTargets::iterator l = this->Targets.begin(); l != this->Targets.end(); |