diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-27 12:56:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-27 12:56:11 (GMT) |
| commit | 624ce2c8bef1a47b563f43144f3031c8b1c95a10 (patch) | |
| tree | 6808a4147fa27e3d84599ed1c4f0f48de7290fae | |
| parent | 5833739c4a64e45d902eabd0a072216e5768428e (diff) | |
| parent | 3106cf4e3d15e0b6320ea3528079dd807f8bc06f (diff) | |
| download | CMake-624ce2c8bef1a47b563f43144f3031c8b1c95a10.zip CMake-624ce2c8bef1a47b563f43144f3031c8b1c95a10.tar.gz CMake-624ce2c8bef1a47b563f43144f3031c8b1c95a10.tar.bz2 | |
Merge branch 'include_external_msproject-exclude-from-all' into release-3.14
Merge-request: !3025
| -rw-r--r-- | Source/cmIncludeExternalMSProjectCommand.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index b224d09..93134ad 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -85,10 +85,12 @@ bool cmIncludeExternalMSProjectCommand::InitialPass( // Create a target instance for this utility. cmTarget* target = this->Makefile->AddNewTarget(cmStateEnums::UTILITY, utility_name.c_str()); + if (this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { + target->SetProperty("EXCLUDE_FROM_ALL", "TRUE"); + } target->SetProperty("GENERATOR_FILE_NAME", utility_name.c_str()); target->SetProperty("EXTERNAL_MSPROJECT", path.c_str()); - target->SetProperty("EXCLUDE_FROM_ALL", "FALSE"); if (!customType.empty()) target->SetProperty("VS_PROJECT_TYPE", customType.c_str()); |