summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorJens Weggemann <jensweh@gmail.com>2016-10-19 01:39:51 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-20 15:51:10 (GMT)
commit149d49ea7c009f9965d9be91cdac8ee6cd2cfb91 (patch)
tree6c30032dfb6c819563174121df090cea9a007258 /Help
parent60d73393a50944c1e81472d7e80a458bcb898554 (diff)
downloadCMake-149d49ea7c009f9965d9be91cdac8ee6cd2cfb91.zip
CMake-149d49ea7c009f9965d9be91cdac8ee6cd2cfb91.tar.gz
CMake-149d49ea7c009f9965d9be91cdac8ee6cd2cfb91.tar.bz2
Teach MAP_IMPORTED_CONFIG_<CONFIG> to support configuration-less import
If this property has an empty list entry, check for `IMPORTED_LOCATION` instead of `IMPORTED_LOCATION_<CONFIG>`. This allows custom imported targets to have some configurations mapped and others fall back to a default location. Closes: #16280
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst9
-rw-r--r--Help/release/dev/allow-fallback-config-mapping.rst6
2 files changed, 13 insertions, 2 deletions
diff --git a/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst b/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
index 9eed069..4da855b 100644
--- a/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
+++ b/Help/prop_tgt/MAP_IMPORTED_CONFIG_CONFIG.rst
@@ -10,8 +10,13 @@ imported from another project may not provide the same set of
configuration names available in the current project. Setting this
property tells CMake what imported configurations are suitable for use
when building the ``<CONFIG>`` configuration. The first configuration in
-the list found to be provided by the imported target is selected. If
-this property is set and no matching configurations are available,
+the list found to be provided by the imported target (i.e. via
+:prop_tgt:`IMPORTED_LOCATION_<CONFIG>` for the mapped-to ``<CONFIG>``)
+is selected. As a special case, an empty list element refers to the
+configuration-less imported target location
+(i.e. :prop_tgt:`IMPORTED_LOCATION`).
+
+If this property is set and no matching configurations are available,
then the imported target is considered to be not found. This property
is ignored for non-imported targets.
diff --git a/Help/release/dev/allow-fallback-config-mapping.rst b/Help/release/dev/allow-fallback-config-mapping.rst
new file mode 100644
index 0000000..2522e10
--- /dev/null
+++ b/Help/release/dev/allow-fallback-config-mapping.rst
@@ -0,0 +1,6 @@
+allow-fallback-config-mapping
+-----------------------------
+
+* The :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` target property learned
+ to interpret empty list elements as referring to the configuration-less
+ imported location specified by :prop_tgt:`IMPORTED_LOCATION`.