summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Lipponer <mail@sebastianlipponer.de>2019-01-14 18:46:59 (GMT)
committerSebastian Lipponer <mail@sebastianlipponer.de>2019-01-14 19:59:33 (GMT)
commit59c408d053cfe90273db04c3804ed91d7ad59d8f (patch)
treedabeb2526b6c1186d62d2574bdb73ac0f89a4e16
parent4541c914b587125048c8e82bc3cd687f573f753a (diff)
downloadCMake-59c408d053cfe90273db04c3804ed91d7ad59d8f.zip
CMake-59c408d053cfe90273db04c3804ed91d7ad59d8f.tar.gz
CMake-59c408d053cfe90273db04c3804ed91d7ad59d8f.tar.bz2
cmTargetPropertyComputer: whitelist 'MANUALLY_ADDED_DEPENDENCIES'.
-rw-r--r--Help/manual/cmake-buildsystem.7.rst1
-rw-r--r--Source/cmTargetPropertyComputer.cxx1
-rw-r--r--Tests/InterfaceLibrary/CMakeLists.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 4fc484b..a1328f2 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -978,6 +978,7 @@ are:
* Built-in properties matching ``COMPATIBLE_INTERFACE_*``
* ``EXPORT_NAME``
* ``IMPORTED``
+* ``MANUALLY_ADDED_DEPENDENCIES``
* ``NAME``
* Properties matching ``IMPORTED_LIBNAME_*``
* Properties matching ``MAP_IMPORTED_CONFIG_*``
diff --git a/Source/cmTargetPropertyComputer.cxx b/Source/cmTargetPropertyComputer.cxx
index 06ce0b1..e1765ff 100644
--- a/Source/cmTargetPropertyComputer.cxx
+++ b/Source/cmTargetPropertyComputer.cxx
@@ -65,6 +65,7 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
builtIns.insert("EXPORT_NAME");
builtIns.insert("IMPORTED");
builtIns.insert("IMPORTED_GLOBAL");
+ builtIns.insert("MANUALLY_ADDED_DEPENDENCIES");
builtIns.insert("NAME");
builtIns.insert("TYPE");
}
diff --git a/Tests/InterfaceLibrary/CMakeLists.txt b/Tests/InterfaceLibrary/CMakeLists.txt
index 3db210a..6aae09a 100644
--- a/Tests/InterfaceLibrary/CMakeLists.txt
+++ b/Tests/InterfaceLibrary/CMakeLists.txt
@@ -31,6 +31,7 @@ add_library(item_real STATIC item.cpp)
add_library(item_iface INTERFACE IMPORTED)
set_property(TARGET item_iface PROPERTY IMPORTED_LIBNAME item_real)
add_dependencies(item_iface item_real)
+get_property(item_iface_dependencies TARGET item_iface PROPERTY MANUALLY_ADDED_DEPENDENCIES)
link_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(InterfaceLibrary definetestexe.cpp)