diff options
| author | Tomoki Imai <Tomoki.Imai@sony.com> | 2017-11-26 11:29:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-04 16:23:38 (GMT) |
| commit | 2c06e9e73ed2214f0f96e392ca2a35f74ee6efa6 (patch) | |
| tree | fe705dc2a71da164d43fff1878bc301e7a352140 | |
| parent | c89e8522bbe0d5526b2d2e6751511fe9737b37e8 (diff) | |
| download | CMake-2c06e9e73ed2214f0f96e392ca2a35f74ee6efa6.zip CMake-2c06e9e73ed2214f0f96e392ca2a35f74ee6efa6.tar.gz CMake-2c06e9e73ed2214f0f96e392ca2a35f74ee6efa6.tar.bz2 | |
include_external_msproject: Support non-Windows target platforms
Allow the command on any generator that supports it, even if
the target platform does not define `WIN32`.
Fixes: #17511
| -rw-r--r-- | Source/cmIncludeExternalMSProjectCommand.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index bd16b1d..85e8cd3 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -3,6 +3,7 @@ #include "cmIncludeExternalMSProjectCommand.h" #ifdef _WIN32 +#include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmStateTypes.h" #include "cmSystemTools.h" @@ -22,7 +23,9 @@ bool cmIncludeExternalMSProjectCommand::InitialPass( } // only compile this for win32 to avoid coverage errors #ifdef _WIN32 - if (this->Makefile->GetDefinition("WIN32")) { + if (this->Makefile->GetDefinition("WIN32") || + this->Makefile->GetGlobalGenerator() + ->IsIncludeExternalMSProjectSupported()) { enum Doing { DoingNone, |