浏览代码

Merge topic 'pic-docs'

c82fbe0 Fix unfortunate documentation error for PIC feature.
David Cole 13 年之前
父节点
当前提交
56591cb9b4
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 1 1
      Source/cmDocumentVariables.cxx
  2. 4 1
      Source/cmTarget.cxx

+ 1 - 1
Source/cmDocumentVariables.cxx

@@ -1365,7 +1365,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. "

+ 4 - 1
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,