summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAvraham Shukron <avraham.shukron@gmail.com>2019-04-05 21:27:04 (GMT)
committerBrad King <brad.king@kitware.com>2019-04-11 15:09:42 (GMT)
commita40f9083dd17d1cccf89ccdf290c3f494cab3aac (patch)
tree2170e1aeba12956f710761a7facc5286b7936dc0 /Source
parent4f07fdde26f1de59e2e8c2a32f0af7a2caff422d (diff)
downloadCMake-a40f9083dd17d1cccf89ccdf290c3f494cab3aac.zip
CMake-a40f9083dd17d1cccf89ccdf290c3f494cab3aac.tar.gz
CMake-a40f9083dd17d1cccf89ccdf290c3f494cab3aac.tar.bz2
INTERFACE Target: allow (PUBLIC/PRIVATE)_HEADER properties
Also support installing headers on an INTERFACE library. Signed-off-by: Avraham Shukron <avraham.shukron@gmail.com> Fixes: #15234
Diffstat (limited to 'Source')
-rw-r--r--Source/cmInstallCommand.cxx3
-rw-r--r--Source/cmTargetPropertyComputer.cxx2
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 20d1a31..65875dc 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -663,8 +663,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");
}