[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4029-g7de39b6

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7de39b6bf2e8de4e69f59dabcd50bcb370573ad1 (commit)
       via  fb1294c3a9c02500d04cd123fd74575be3aa0c6b (commit)
      from  1c410d87a2bc22d05d1f0ae85dfbb101040b5b9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de39b6bf2e8de4e69f59dabcd50bcb370573ad1
commit 7de39b6bf2e8de4e69f59dabcd50bcb370573ad1
Merge: 1c410d8 fb1294c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 28 11:49:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 28 11:49:03 2013 -0400

    Merge topic 'MAP_IMPORTED_CONFIG-property-default' into next
    
    fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb1294c3a9c02500d04cd123fd74575be3aa0c6b
commit fb1294c3a9c02500d04cd123fd74575be3aa0c6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 27 15:10:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 28 17:41:18 2013 +0200

    cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 2c2d377..9c06832 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_<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)
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 147c332..acb2208 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)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmDocumentVariables.cxx |    8 ++++++++
 Source/cmTarget.cxx            |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake