diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-09-03 15:22:44 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-05 13:49:59 (GMT) |
| commit | 5a365420866849ed0c5cb54ebae5ca96bd5bd984 (patch) | |
| tree | 55e2e46c032e2433eb0b7b591bfd2451b6a75663 /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
| parent | 3059e6aed7ac3e773dd1f184558b9fd8a4b7b11e (diff) | |
| download | CMake-5a365420866849ed0c5cb54ebae5ca96bd5bd984.zip CMake-5a365420866849ed0c5cb54ebae5ca96bd5bd984.tar.gz CMake-5a365420866849ed0c5cb54ebae5ca96bd5bd984.tar.bz2 | |
Refactor: Add allowArch parameter to cmake::CreateGlobalGenerator()
Diffstat (limited to 'Source/cmGlobalVisualStudioVersionedGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 4b877ce..95357e7 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -140,7 +140,7 @@ class cmGlobalVisualStudioVersionedGenerator::Factory15 { public: std::unique_ptr<cmGlobalGenerator> CreateGlobalGenerator( - const std::string& name, cmake* cm) const override + const std::string& name, bool allowArch, cmake* cm) const override { std::string genName; const char* p = cmVS15GenName(name, genName); @@ -152,7 +152,7 @@ public: new cmGlobalVisualStudioVersionedGenerator( cmGlobalVisualStudioGenerator::VS15, cm, genName, "")); } - if (*p++ != ' ') { + if (!allowArch || *p++ != ' ') { return std::unique_ptr<cmGlobalGenerator>(); } if (strcmp(p, "Win64") == 0) { @@ -234,7 +234,7 @@ class cmGlobalVisualStudioVersionedGenerator::Factory16 { public: std::unique_ptr<cmGlobalGenerator> CreateGlobalGenerator( - const std::string& name, cmake* cm) const override + const std::string& name, bool /*allowArch*/, cmake* cm) const override { std::string genName; const char* p = cmVS16GenName(name, genName); |