diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-27 12:55:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-27 12:56:00 (GMT) |
| commit | 9b075d90326aeaf5450fa9b4f40bdcc76c3b2120 (patch) | |
| tree | f36f9067968a05d5ffd829339697c29185d9f9b3 /Source | |
| parent | 72a630645417dd19afeb621af6d64dcd71862065 (diff) | |
| parent | 3106cf4e3d15e0b6320ea3528079dd807f8bc06f (diff) | |
| download | CMake-9b075d90326aeaf5450fa9b4f40bdcc76c3b2120.zip CMake-9b075d90326aeaf5450fa9b4f40bdcc76c3b2120.tar.gz CMake-9b075d90326aeaf5450fa9b4f40bdcc76c3b2120.tar.bz2 | |
Merge topic 'include_external_msproject-exclude-from-all'
3106cf4e3d include_external_msproject: Restore support for EXCLUDE_FROM_ALL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3025
Diffstat (limited to 'Source')
| -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()); |