echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InterfaceLibrary: Whitelist EXPORT_PROPERTIES property

Browse Source 
Fixes: #19261
This commit is contained in:
Brad King 2019-05-17 09:14:45 -04:00
parent 736f9d184d
commit 73a829e078
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Help/manual/cmake-buildsystem.7.rst
View File

@ -977,6 +977,7 @@ are:
* Properties matching ``INTERFACE_*`` * Properties matching ``INTERFACE_*``
* Built-in properties matching ``COMPATIBLE_INTERFACE_*`` * Built-in properties matching ``COMPATIBLE_INTERFACE_*``
* ``EXPORT_NAME`` * ``EXPORT_NAME``
* ``EXPORT_PROPERTIES``
* ``IMPORTED`` * ``IMPORTED``
* ``MANUALLY_ADDED_DEPENDENCIES`` * ``MANUALLY_ADDED_DEPENDENCIES``
* ``NAME`` * ``NAME``

1
Source/cmTargetPropertyComputer.cxx
View File

@ -63,6 +63,7 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
builtIns.insert("COMPATIBLE_INTERFACE_NUMBER_MIN"); builtIns.insert("COMPATIBLE_INTERFACE_NUMBER_MIN");
builtIns.insert("COMPATIBLE_INTERFACE_STRING"); builtIns.insert("COMPATIBLE_INTERFACE_STRING");
builtIns.insert("EXPORT_NAME"); builtIns.insert("EXPORT_NAME");
builtIns.insert("EXPORT_PROPERTIES");
builtIns.insert("IMPORTED"); builtIns.insert("IMPORTED");
builtIns.insert("IMPORTED_GLOBAL"); builtIns.insert("IMPORTED_GLOBAL");
builtIns.insert("MANUALLY_ADDED_DEPENDENCIES"); builtIns.insert("MANUALLY_ADDED_DEPENDENCIES");

2
Tests/ExportImport/Export/Interface/CMakeLists.txt
View File

@ -41,6 +41,8 @@ install(FILES
add_library(cmakeonly INTERFACE) add_library(cmakeonly INTERFACE)
set_property(TARGET cmakeonly PROPERTY INTERFACE_COMPILE_DEFINITIONS [[DEF="\"\$\B"]]) set_property(TARGET cmakeonly PROPERTY INTERFACE_COMPILE_DEFINITIONS [[DEF="\"\$\B"]])
set_property(TARGET cmakeonly PROPERTY custom_property CustomPropertyValue)
set_property(TARGET cmakeonly PROPERTY EXPORT_PROPERTIES custom_property)
install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
cmakeonly cmakeonly

8
Tests/ExportImport/Import/Interface/CMakeLists.txt
View File

@ -109,4 +109,12 @@ foreach(ns exp bld)
"not\n" "not\n"
" " [[DEF="\"\$\B"]] "\n") " " [[DEF="\"\$\B"]] "\n")
endif() endif()
get_property(custom TARGET ${ns}::cmakeonly PROPERTY custom_property)
if(NOT custom STREQUAL "CustomPropertyValue")
message(SEND_ERROR
"${ns}::cmakeonly property custom_property is:\n"
" ${custom}\n"
"not\n"
" CustomPropertyValue\n")
endif()
endforeach() endforeach()