diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-12 14:20:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-12 14:20:20 (GMT) |
| commit | 4adc0b7c758ed98776bec63d21bb2037b0f28e2d (patch) | |
| tree | 9bd43553c8d780641c16f5f285f90f8bf9c5130c /Source | |
| parent | db6fdfdb053a372382ff8eadad9bfa47c1a3b4bc (diff) | |
| parent | a40f9083dd17d1cccf89ccdf290c3f494cab3aac (diff) | |
| download | CMake-4adc0b7c758ed98776bec63d21bb2037b0f28e2d.zip CMake-4adc0b7c758ed98776bec63d21bb2037b0f28e2d.tar.gz CMake-4adc0b7c758ed98776bec63d21bb2037b0f28e2d.tar.bz2 | |
Merge topic 'iface-headers'
a40f9083dd INTERFACE Target: allow (PUBLIC/PRIVATE)_HEADER properties
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3181
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmInstallCommand.cxx | 3 | ||||
| -rw-r--r-- | Source/cmTargetPropertyComputer.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 9736b41..dba4bbb 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -666,8 +666,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) // generators for them. bool createInstallGeneratorsForTargetFileSets = true; - if (target.IsFrameworkOnApple() || - target.GetType() == cmStateEnums::INTERFACE_LIBRARY) { + if (target.IsFrameworkOnApple()) { createInstallGeneratorsForTargetFileSets = false; } diff --git a/Source/cmTargetPropertyComputer.cxx b/Source/cmTargetPropertyComputer.cxx index d2c3496..994fcf7 100644 --- a/Source/cmTargetPropertyComputer.cxx +++ b/Source/cmTargetPropertyComputer.cxx @@ -67,6 +67,8 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty( builtIns.insert("IMPORTED_GLOBAL"); builtIns.insert("MANUALLY_ADDED_DEPENDENCIES"); builtIns.insert("NAME"); + builtIns.insert("PRIVATE_HEADER"); + builtIns.insert("PUBLIC_HEADER"); builtIns.insert("TYPE"); } |