diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:41:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:41:49 (GMT) |
| commit | 1e54b380cba9f654a7bf45f5ff9db80cbb662438 (patch) | |
| tree | 3bb095d0fcc59bb725acad76e47d2c27cc4fe57b /Source/cmTarget.cxx | |
| parent | a65df441f2f1acefd1900382b09c410f9c15f4b2 (diff) | |
| parent | fb1294c3a9c02500d04cd123fd74575be3aa0c6b (diff) | |
| download | CMake-1e54b380cba9f654a7bf45f5ff9db80cbb662438.zip CMake-1e54b380cba9f654a7bf45f5ff9db80cbb662438.tar.gz CMake-1e54b380cba9f654a7bf45f5ff9db80cbb662438.tar.bz2 | |
Merge topic 'MAP_IMPORTED_CONFIG-property-default'
fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ac655da..8ccd19c 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_<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) |