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/cmGlobalVisualStudio71Generator.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/cmGlobalVisualStudio71Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio71Generator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx index ec1380b..d0aec61 100644 --- a/Source/cmGlobalVisualStudio71Generator.cxx +++ b/Source/cmGlobalVisualStudio71Generator.cxx @@ -157,7 +157,8 @@ void cmGlobalVisualStudio71Generator::WriteProjectDepends( // executables to the libraries it uses are also done here void cmGlobalVisualStudio71Generator::WriteExternalProject( std::ostream& fout, const std::string& name, const std::string& location, - const char* typeGuid, const std::set<BT<std::string>>& depends) + const char* typeGuid, + const std::set<BT<std::pair<std::string, bool>>>& depends) { fout << "Project(\"{" << (typeGuid ? typeGuid : this->ExternalProjectType(location)) @@ -169,8 +170,8 @@ void cmGlobalVisualStudio71Generator::WriteExternalProject( // project instead of in the global section if (!depends.empty()) { fout << "\tProjectSection(ProjectDependencies) = postProject\n"; - for (BT<std::string> const& it : depends) { - std::string const& dep = it.Value; + for (BT<std::pair<std::string, bool>> const& it : depends) { + std::string const& dep = it.Value.first; if (!dep.empty()) { fout << "\t\t{" << this->GetGUID(dep) << "} = {" << this->GetGUID(dep) << "}\n"; |