diff options
author | David Cole <david.cole@kitware.com> | 2011-10-25 19:33:48 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-25 19:33:48 (GMT) |
commit | 039d1b1fd9edad20f139aad8df7ebe0f612ef65f (patch) | |
tree | 5412bdf6f2ec259e3655a0ced98813233345a588 | |
parent | 676fb3b2acea40f5eae7d4badc9dbea2366ce2da (diff) | |
parent | d9cbba7c2cd364a19b42cd856f5d048deb92b415 (diff) | |
download | CMake-039d1b1fd9edad20f139aad8df7ebe0f612ef65f.zip CMake-039d1b1fd9edad20f139aad8df7ebe0f612ef65f.tar.gz CMake-039d1b1fd9edad20f139aad8df7ebe0f612ef65f.tar.bz2 |
Merge topic 'cmake-link-interface-libraries'
d9cbba7 Initialize LINK_INTERFACE_LIBRARIES target property with a variable
-rw-r--r-- | Source/cmDocumentVariables.cxx | 9 | ||||
-rw-r--r-- | Source/cmTarget.cxx | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index f2b01f1..f4d4e7c 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1219,7 +1219,14 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Therefore a specific build configuration must be chosen even " "if the generated build system supports multiple configurations.",false, "Variables that Control the Build"); - + cm->DefineProperty + ("CMAKE_LINK_INTERFACE_LIBRARIES", cmProperty::VARIABLE, + "Default value for LINK_INTERFACE_LIBRARIES of targets.", + "This variable is used to initialize the " + "LINK_INTERFACE_LIBRARIES 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 e74e70c..f7d3ba9 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -642,6 +642,9 @@ void cmTarget::DefineProperties(cmake *cm) "If the list is empty then no transitive link dependencies will be " "incorporated when this target is linked into another target even if " "the default set is non-empty. " + "This property is initialized by the value of the variable " + "CMAKE_LINK_INTERFACE_LIBRARIES if it is set when a target is " + "created. " "This property is ignored for STATIC libraries."); cm->DefineProperty @@ -1176,6 +1179,7 @@ void cmTarget::SetMakefile(cmMakefile* mf) this->SetPropertyDefault("Fortran_MODULE_DIRECTORY", 0); this->SetPropertyDefault("OSX_ARCHITECTURES", 0); this->SetPropertyDefault("AUTOMOC", 0); + this->SetPropertyDefault("LINK_INTERFACE_LIBRARIES", 0); // Collect the set of configuration types. std::vector<std::string> configNames; |