From fb1294c3a9c02500d04cd123fd74575be3aa0c6b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 27 Aug 2013 15:10:51 +0200 Subject: [PATCH] cmTarget: Add initializer for MAP_IMPORTED_CONFIG_ --- Source/cmDocumentVariables.cxx | 8 ++++++++ Source/cmTarget.cxx | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 2c2d377abc..9c068323f5 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1578,6 +1578,14 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "See that target property for additional information.", false, "Variables that Control the Build"); + cm->DefineProperty + ("CMAKE_MAP_IMPORTED_CONFIG_", cmProperty::VARIABLE, + "Default value for MAP_IMPORTED_CONFIG_ of targets.", + "This variable is used to initialize the " + "MAP_IMPORTED_CONFIG_ property on all the targets. " + "See that target property for additional information.", + false, + "Variables that Control the Build"); // Variables defined when the a language is enabled These variables will // also be defined whenever CMake has loaded its support for compiling (LANG) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 147c332788..acb22089b1 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -924,7 +924,10 @@ void cmTarget::DefineProperties(cmake *cm) "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, then the imported target is considered " - "to be not found. This property is ignored for non-imported targets.", + "to be not found. This property is ignored for non-imported targets.\n" + "This property is initialized by the value of the variable " + "CMAKE_MAP_IMPORTED_CONFIG_ if it is set when a target is " + "created.", false /* TODO: make this chained */ ); cm->DefineProperty @@ -1649,6 +1652,7 @@ void cmTarget::SetMakefile(cmMakefile* mf) "LIBRARY_OUTPUT_DIRECTORY_", "RUNTIME_OUTPUT_DIRECTORY_", "PDB_OUTPUT_DIRECTORY_", + "MAP_IMPORTED_CONFIG_", 0}; for(std::vector::iterator ci = configNames.begin(); ci != configNames.end(); ++ci)