diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-21 15:01:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-21 15:02:23 (GMT) |
| commit | 4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3 (patch) | |
| tree | b81f8e37657e2e9385576af1bc070342e7b71804 /Source | |
| parent | bcdd8cfe441c45dd1c9f0617c6652eb30386e7c2 (diff) | |
| parent | b73857561fe3ffb8ee0ce3057706c51faabf2e4d (diff) | |
| download | CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.zip CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.tar.gz CMake-4aeaf72fd61f4dbc1e9fffd75a16bfb2c67b90d3.tar.bz2 | |
Merge topic 'clang-manifest'
b73857561f Clang: embed windows manifests with GNU interface
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6534
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 59e4141..4e7f50d 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -240,11 +240,16 @@ std::string cmCommonTargetGenerator::GetManifests(const std::string& config) std::vector<std::string> manifests; manifests.reserve(manifest_srcs.size()); + + std::string lang = this->GeneratorTarget->GetLinkerLanguage(config); + std::string const& manifestFlag = + this->Makefile->GetDefinition("CMAKE_" + lang + "_LINKER_MANIFEST_FLAG"); for (cmSourceFile const* manifest_src : manifest_srcs) { - manifests.push_back(this->LocalCommonGenerator->ConvertToOutputFormat( - this->LocalCommonGenerator->MaybeRelativeToWorkDir( - manifest_src->GetFullPath()), - cmOutputConverter::SHELL)); + manifests.push_back(manifestFlag + + this->LocalCommonGenerator->ConvertToOutputFormat( + this->LocalCommonGenerator->MaybeRelativeToWorkDir( + manifest_src->GetFullPath()), + cmOutputConverter::SHELL)); } return cmJoin(manifests, " "); |