diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-18 16:20:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-18 16:20:56 (GMT) |
| commit | 2ee4b288ad9727b82eaa5c5b0f008ba00bf78e2d (patch) | |
| tree | 03e716ad7ea5311c4c9d1b19c03f7a5d7cb3d02b /Source/cmGlobalVisualStudio71Generator.h | |
| parent | 3276f85fd774035221d00b291bfe0c624f6a4831 (diff) | |
| parent | 665c8fde8bd2e015c9c01d095cd31987f78f74e4 (diff) | |
| download | CMake-2ee4b288ad9727b82eaa5c5b0f008ba00bf78e2d.zip CMake-2ee4b288ad9727b82eaa5c5b0f008ba00bf78e2d.tar.gz CMake-2ee4b288ad9727b82eaa5c5b0f008ba00bf78e2d.tar.bz2 | |
Merge topic 'ninja-multi-framework-dependency-autogen-fix'
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4363
Diffstat (limited to 'Source/cmGlobalVisualStudio71Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio71Generator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h index 61a2f6f..7eadaf3 100644 --- a/Source/cmGlobalVisualStudio71Generator.h +++ b/Source/cmGlobalVisualStudio71Generator.h @@ -32,9 +32,10 @@ protected: cmGeneratorTarget const& target, std::vector<std::string> const& configs, const std::set<std::string>& configsPartOfDefaultBuild, const std::string& platformMapping = "") override; - void WriteExternalProject(std::ostream& fout, const std::string& name, - const std::string& path, const char* typeGuid, - const std::set<BT<std::string>>& depends) override; + void WriteExternalProject( + std::ostream& fout, const std::string& name, const std::string& path, + const char* typeGuid, + const std::set<BT<std::pair<std::string, bool>>>& depends) override; // Folders are not supported by VS 7.1. bool UseFolderProperty() const override { return false; } |