mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'whitelist-more-interface-properties'

Browse Source 
fb3c5bfd cmTargetPropertyComputer: whitelist custom properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1515
This commit is contained in:
Brad King
2017-11-30 12:57:01 +00:00
committed by Kitware Robot
parent 21806e6f5f fb3c5bfdbe
commit 5d43e46ad5
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Help/release/dev/whitelist-more-interface-properties.rst
+7
View File
@@ -0,0 +1,7 @@
whitelist-more-interface-properties
-----------------------------------
* ``INTERFACE`` libraries may now have custom properties set on them if they
start with either an underscore (``_``) or a lowercase ASCII character. The
original intention was to only allow properties which made sense for
``INTERFACE`` libraries, but it also blocked usage of custom properties.
Source/cmTargetPropertyComputer.cxx
+7
View File
@@ -3,6 +3,7 @@
#include "cmTargetPropertyComputer.h"
#include <cctype>
#include <sstream>
#include <unordered_set>
@@ -49,6 +50,12 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
if (cmHasLiteralPrefix(prop, "INTERFACE_")) {
return true;
}
if (cmHasLiteralPrefix(prop, "_")) {
return true;
}
if (std::islower(prop[0])) {
return true;
}
static std::unordered_set<std::string> builtIns;
if (builtIns.empty()) {
builtIns.insert("COMPATIBLE_INTERFACE_BOOL");
Tests/RunCMake/interface_library/whitelist.cmake
+10
View File
@@ -4,3 +4,13 @@ add_library(iface INTERFACE)
set_property(TARGET iface PROPERTY OUTPUT_NAME output)
set_property(TARGET iface APPEND PROPERTY OUTPUT_NAME append)
get_target_property(outname iface OUTPUT_NAME)
# Properties starting with `_` are allowed.
set_property(TARGET iface PROPERTY "_custom_property" output)
set_property(TARGET iface APPEND PROPERTY "_custom_property" append)
get_target_property(outname iface "_custom_property")
# Properties starting with a lowercase letter are allowed.
set_property(TARGET iface PROPERTY "custom_property" output)
set_property(TARGET iface APPEND PROPERTY "custom_property" append)
get_target_property(outname iface "custom_property")