diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-13 16:12:34 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-17 13:24:57 (GMT) |
| commit | 7abc3d61acf5be976ce5b9f2c13f48f7f61e8e76 (patch) | |
| tree | 2208f8fcb6dd079fdc3585926c145f3ca578b543 /Source/cmGlobalVisualStudio8Generator.cxx | |
| parent | b88a671f75bdd1cb4f24166a9a6d98a678de1e62 (diff) | |
| download | CMake-7abc3d61acf5be976ce5b9f2c13f48f7f61e8e76.zip CMake-7abc3d61acf5be976ce5b9f2c13f48f7f61e8e76.tar.gz CMake-7abc3d61acf5be976ce5b9f2c13f48f7f61e8e76.tar.bz2 | |
Ninja Multi-Config: Fix issue with framework dependencies and Autogen
Fixes: #20345
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index c0551f7..1c62fbd 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -211,7 +211,7 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets() // All targets depend on the build-system check target. for (const auto& ti : tgts) { if (ti->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET) { - ti->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET); + ti->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false); } } } @@ -325,9 +325,10 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies( cmGeneratorTarget* target) { // Look for utility dependencies that magically link. - for (BT<std::string> const& ui : target->GetUtilities()) { + for (BT<std::pair<std::string, bool>> const& ui : target->GetUtilities()) { if (cmGeneratorTarget* depTarget = - target->GetLocalGenerator()->FindGeneratorTargetToUse(ui.Value)) { + target->GetLocalGenerator()->FindGeneratorTargetToUse( + ui.Value.first)) { if (depTarget->GetType() != cmStateEnums::INTERFACE_LIBRARY && depTarget->GetProperty("EXTERNAL_MSPROJECT")) { // This utility dependency names an external .vcproj target. |