diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-24 18:24:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-24 18:24:01 (GMT) |
| commit | 56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d (patch) | |
| tree | e9d94239f2de6d3aacd517e03ce9596beb8999f4 /Source | |
| parent | 4f7731d814d4228165c70ec9fd6b580e5541ddc6 (diff) | |
| parent | c82fbe0c1f9c39db2421afc1079e2aa071f50a37 (diff) | |
| download | CMake-56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d.zip CMake-56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d.tar.gz CMake-56591cb9b4f1caa62cde98dedf6eb1a0dc7d8d8d.tar.bz2 | |
Merge topic 'pic-docs'
c82fbe0 Fix unfortunate documentation error for PIC feature.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 0ee7759..badc3e4 100644 --- a/Source/cmDocumentVariables.cxx +++ b/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. " diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 48811c8..65b586d 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, |