diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-18 14:46:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-18 14:46:26 (GMT) |
| commit | e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6 (patch) | |
| tree | 82cb9367ece2db493129e2df10170d8a3e4ca8c7 /Source/cmTarget.cxx | |
| parent | f63d84c37c9ee1ea686369848b5bfc22916e1551 (diff) | |
| parent | bb4c2781ced335c81b3c9307069792dba66d5062 (diff) | |
| download | CMake-e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6.zip CMake-e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6.tar.gz CMake-e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6.tar.bz2 | |
Merge topic 'pch-reuse-no-prop'
bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4046
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 05c9e6e..14635f7 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1288,11 +1288,8 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) reusedTarget->SetProperty("COMPILE_PDB_OUTPUT_DIRECTORY", cmStrCat(reusedFrom, ".dir/").c_str()); - for (auto p : { "COMPILE_PDB_NAME", "PRECOMPILE_HEADERS", - "INTERFACE_PRECOMPILE_HEADERS" }) { - this->SetProperty(p, reusedTarget->GetProperty(p)); - } - + this->SetProperty("COMPILE_PDB_NAME", + reusedTarget->GetProperty("COMPILE_PDB_NAME")); this->AddUtility(reusedFrom, impl->Makefile); } else { impl->Properties.SetProperty(prop, value); |