diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-13 17:42:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-13 17:42:45 (GMT) |
| commit | bdbee54a8317806b4a93aec9f8eee1b876da9a32 (patch) | |
| tree | 94140855754fd9e6ee81b9d71995606eeae8599a /Source/cmServerProtocol.cxx | |
| parent | 7c557e2227f446d1c265ac7b5aa8055e3f4ea713 (diff) | |
| parent | 1b5e52fd651ab17b3f9efb8f3e2e069550bf7a66 (diff) | |
| download | CMake-bdbee54a8317806b4a93aec9f8eee1b876da9a32.zip CMake-bdbee54a8317806b4a93aec9f8eee1b876da9a32.tar.gz CMake-bdbee54a8317806b4a93aec9f8eee1b876da9a32.tar.bz2 | |
Merge topic 'genex-COMPILE_LANGUAGE-system-include'
1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile
2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1844
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index fbfaa40..7c10110 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -725,8 +725,9 @@ static Json::Value DumpSourceFilesList( lg->AppendIncludeDirectories(includes, evaluatedIncludes, *file); for (const auto& include : includes) { - fileData.IncludePathList.push_back(std::make_pair( - include, target->IsSystemIncludeDirectory(include, config))); + fileData.IncludePathList.push_back( + std::make_pair(include, target->IsSystemIncludeDirectory( + include, config, fileData.Language))); } } @@ -1005,7 +1006,7 @@ static Json::Value DumpTarget(cmGeneratorTarget* target, lg->GetIncludeDirectories(includePathList, target, lang, config, true); for (std::string const& i : includePathList) { ld.IncludePathList.push_back( - std::make_pair(i, target->IsSystemIncludeDirectory(i, config))); + std::make_pair(i, target->IsSystemIncludeDirectory(i, config, lang))); } } |