kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'MAP_IMPORTED_CONFIG-property-default' 

fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
This commit is contained in:
Brad King 2013-10-07 15:41:49 -04:00 committed by CMake Topic Stage
parent a65df441f2 fb1294c3a9
commit 1e54b380cb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmDocumentVariables.cxx
View File

@ -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_<CONFIG>", cmProperty::VARIABLE,
"Default value for MAP_IMPORTED_CONFIG_<CONFIG> of targets.",
"This variable is used to initialize the "
"MAP_IMPORTED_CONFIG_<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)

6
Source/cmTarget.cxx
View File

@ -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_<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<std::string>::iterator ci = configNames.begin();
ci != configNames.end(); ++ci)