[Cmake-commits] CMake branch, next, updated. v2.8.9-3050-gec8ad70

[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  ec8ad7088144d0907889310d97e0b062d2a427e1 (commit)
       via  e7899c5d5b1d0cc60d4e173ce64eff5cf3eebfb0 (commit)
       via  539cc289baed94a500b565aafd103986d1fa2711 (commit)
      from  50356b31f5799f9bfd85f97e305682a71de9ce2d (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=ec8ad7088144d0907889310d97e0b062d2a427e1
commit ec8ad7088144d0907889310d97e0b062d2a427e1
Merge: 50356b3 e7899c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 13 03:00:29 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 13 03:00:29 2012 -0400

    Merge topic 'pic-docs' into next
    
    e7899c5 Fix unfortunate documentation error for PIC feature.
    539cc28 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7899c5d5b1d0cc60d4e173ce64eff5cf3eebfb0
commit e7899c5d5b1d0cc60d4e173ce64eff5cf3eebfb0
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 13 08:59:46 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 77aaffc..5bbe366 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/CMakeVersion.cmake      |    2 +-
 Source/cmDocumentVariables.cxx |    2 +-
 Source/cmTarget.cxx            |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake