[Cmake-commits] CMake branch, next, updated. v3.0.0-4404-gc7be55d
Nils Gladitz
nilsgladitz at gmail.com
Mon Jul 21 11:55:30 EDT 2014
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 c7be55d48bcf49ef83945b9fd530923ca648edc4 (commit)
via 846e56db5734f30f77bb078f13eec25917b5e693 (commit)
via a4540a64155f08ccbd919c8106c5674d048dcd0e (commit)
from 26f4d69d567e6ae3b88821a4f25817c5876f6a1c (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=c7be55d48bcf49ef83945b9fd530923ca648edc4
commit c7be55d48bcf49ef83945b9fd530923ca648edc4
Merge: 26f4d69 846e56d
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 11:55:30 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 21 11:55:30 2014 -0400
Merge topic 'deprecated-properties' into next
846e56db Help: List POST/PRE_INSTALL_SCRIPT properties as deprecated.
a4540a64 Help: Document COMPILE_DEFINITIONS_<Config> properties as deprecated.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=846e56db5734f30f77bb078f13eec25917b5e693
commit 846e56db5734f30f77bb078f13eec25917b5e693
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 17:53:56 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 21 17:53:56 2014 +0200
Help: List POST/PRE_INSTALL_SCRIPT properties as deprecated.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 2075d73..f6a650e 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -207,9 +207,7 @@ Properties on Targets
/prop_tgt/PDB_OUTPUT_DIRECTORY_CONFIG
/prop_tgt/PDB_OUTPUT_DIRECTORY
/prop_tgt/POSITION_INDEPENDENT_CODE
- /prop_tgt/POST_INSTALL_SCRIPT
/prop_tgt/PREFIX
- /prop_tgt/PRE_INSTALL_SCRIPT
/prop_tgt/PRIVATE_HEADER
/prop_tgt/PROJECT_LABEL
/prop_tgt/PUBLIC_HEADER
@@ -342,6 +340,8 @@ Properties on Targets
:maxdepth: 1
/prop_tgt/COMPILE_DEFINITIONS_CONFIG
+ /prop_tgt/POST_INSTALL_SCRIPT
+ /prop_tgt/PRE_INSTALL_SCRIPT
Properties on Source Files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4540a64155f08ccbd919c8106c5674d048dcd0e
commit a4540a64155f08ccbd919c8106c5674d048dcd0e
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 17:44:46 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 21 17:44:46 2014 +0200
Help: Document COMPILE_DEFINITIONS_<Config> properties as deprecated.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index e4546c1..2075d73 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -7,8 +7,12 @@ cmake-properties(7)
.. contents::
+Normal Properties
+=================
+These properties may be used freely in CMake projects.
+
Properties of Global Scope
-==========================
+^^^^^^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -42,7 +46,7 @@ Properties of Global Scope
/prop_gbl/USE_FOLDERS
Properties on Directories
-=========================
+^^^^^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -51,7 +55,6 @@ Properties on Directories
/prop_dir/CACHE_VARIABLES
/prop_dir/CLEAN_NO_CUSTOM
/prop_dir/CMAKE_CONFIGURE_DEPENDS
- /prop_dir/COMPILE_DEFINITIONS_CONFIG
/prop_dir/COMPILE_DEFINITIONS
/prop_dir/COMPILE_OPTIONS
/prop_dir/DEFINITIONS
@@ -74,7 +77,7 @@ Properties on Directories
/prop_dir/VS_GLOBAL_SECTION_PRE_section
Properties on Targets
-=====================
+^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -101,7 +104,6 @@ Properties on Targets
/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX
/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN
/prop_tgt/COMPATIBLE_INTERFACE_STRING
- /prop_tgt/COMPILE_DEFINITIONS_CONFIG
/prop_tgt/COMPILE_DEFINITIONS
/prop_tgt/COMPILE_FEATURES
/prop_tgt/COMPILE_FLAGS
@@ -245,7 +247,7 @@ Properties on Targets
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
Properties on Tests
-===================
+^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -269,7 +271,7 @@ Properties on Tests
/prop_test/WORKING_DIRECTORY
Properties on Source Files
-==========================
+^^^^^^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -277,7 +279,6 @@ Properties on Source Files
/prop_sf/ABSTRACT
/prop_sf/AUTOUIC_OPTIONS
/prop_sf/AUTORCC_OPTIONS
- /prop_sf/COMPILE_DEFINITIONS_CONFIG
/prop_sf/COMPILE_DEFINITIONS
/prop_sf/COMPILE_FLAGS
/prop_sf/EXTERNAL_OBJECT
@@ -297,7 +298,7 @@ Properties on Source Files
/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE
Properties on Cache Entries
-===========================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
@@ -310,10 +311,43 @@ Properties on Cache Entries
/prop_cache/VALUE
Properties on Installed Files
-=============================
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. toctree::
:maxdepth: 1
/prop_inst/CPACK_NEVER_OVERWRITE.rst
/prop_inst/CPACK_PERMANENT.rst
+
+
+Deprecated Properties
+=====================
+
+These properties are available only for compatibility with older
+versions of CMake. Do not use them in new code.
+
+Properties on Directories
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. toctree::
+ :maxdepth: 1
+
+ /prop_dir/COMPILE_DEFINITIONS_CONFIG
+
+
+Properties on Targets
+^^^^^^^^^^^^^^^^^^^^^
+
+.. toctree::
+ :maxdepth: 1
+
+ /prop_tgt/COMPILE_DEFINITIONS_CONFIG
+
+
+Properties on Source Files
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. toctree::
+ :maxdepth: 1
+
+ /prop_sf/COMPILE_DEFINITIONS_CONFIG
diff --git a/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
index c22606b..af18d7b 100644
--- a/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,6 +1,8 @@
COMPILE_DEFINITIONS_<CONFIG>
----------------------------
+Ignored. See CMake Policy :policy:`CMP0043`.
+
Per-configuration preprocessor definitions in a directory.
This is the configuration-specific version of :prop_dir:`COMPILE_DEFINITIONS`
diff --git a/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
index e695f38..4920f58 100644
--- a/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,6 +1,8 @@
COMPILE_DEFINITIONS_<CONFIG>
----------------------------
+Ignored. See CMake Policy :policy:`CMP0043`.
+
Per-configuration preprocessor definitions on a source file.
This is the configuration-specific version of COMPILE_DEFINITIONS.
diff --git a/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
index e359d2c..1dba356 100644
--- a/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,6 +1,8 @@
COMPILE_DEFINITIONS_<CONFIG>
----------------------------
+Ignored. See CMake Policy :policy:`CMP0043`.
+
Per-configuration preprocessor definitions on a target.
This is the configuration-specific version of :prop_tgt:`COMPILE_DEFINITIONS`
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 58 ++++++++++++++++++++------
Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst | 2 +
Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst | 2 +
Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst | 2 +
4 files changed, 52 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list