[Cmake-commits] CMake branch, next, updated. v2.8.9-197-g34f9f40

[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  34f9f40a21ff7c78a06ba54ec628261ae82d5894 (commit)
       via  c82fbe0c1f9c39db2421afc1079e2aa071f50a37 (commit)
      from  37b7e5a10c838a8ed19c72be45ec39f0a4732c34 (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=34f9f40a21ff7c78a06ba54ec628261ae82d5894
commit 34f9f40a21ff7c78a06ba54ec628261ae82d5894
Merge: 37b7e5a c82fbe0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 20 16:34:06 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 20 16:34:06 2012 -0400

    Merge topic 'pic-docs' into next
    
    c82fbe0 Fix unfortunate documentation error for PIC feature.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c82fbe0c1f9c39db2421afc1079e2aa071f50a37
commit c82fbe0c1f9c39db2421afc1079e2aa071f50a37
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 13 08:58:41 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 20 22:33:27 2012 +0200

    Fix unfortunate documentation error for PIC feature.
    
    The wrong variable is documented, and it is not referred to in
    the target-specific property.

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 05ef8fc..0fa0b29 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1351,7 +1351,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      false,
      "Variables that Control the Build");
   cm->DefineProperty
-    ("CMAKE_POSITION_INDEPENDENT_FLAGS", cmProperty::VARIABLE,
+    ("CMAKE_POSITION_INDEPENDENT_CODE", cmProperty::VARIABLE,
      "Default value for POSITION_INDEPENDENT_CODE of targets.",
      "This variable is used to initialize the "
      "POSITION_INDEPENDENT_CODE property on all the targets. "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 775662c..b936500 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -761,7 +761,10 @@ void cmTarget::DefineProperties(cmake *cm)
      "The POSITION_INDEPENDENT_CODE property determines whether position "
      "independent executables or shared libraries will be created.  "
      "This property is true by default for SHARED and MODULE library "
-     "targets and false otherwise.");
+     "targets and false otherwise.  "
+     "This property is initialized by the value of the variable "
+     "CMAKE_POSITION_INDEPENDENT_CODE if it is set when a target is"
+     "created.");
 
   cm->DefineProperty
     ("POST_INSTALL_SCRIPT", cmProperty::TARGET,

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

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


hooks/post-receive
-- 
CMake