[Cmake-commits] CMake branch, next, updated. v3.0.0-4414-g64d13c1

Nils Gladitz nilsgladitz at gmail.com
Mon Jul 21 13:44:20 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  64d13c146c0470cf46798d10146cadedf9a25445 (commit)
       via  8d8d4404f66d646d5ee50a7a945e669f3816171d (commit)
       via  8322676382b9a9443bb892044f7421e88ba7d21c (commit)
      from  143931d04181a6b192da26c3e3996d9cba0eb04d (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=64d13c146c0470cf46798d10146cadedf9a25445
commit 64d13c146c0470cf46798d10146cadedf9a25445
Merge: 143931d 8d8d440
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 13:44:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 21 13:44:19 2014 -0400

    Merge topic 'deprecated-properties' into next
    
    8d8d4404 Help: Add missing extra spaces
    83226763 Help: Flatten hierarchy in property documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d8d4404f66d646d5ee50a7a945e669f3816171d
commit 8d8d4404f66d646d5ee50a7a945e669f3816171d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 19:38:22 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 21 19:41:52 2014 +0200

    Help: Add missing extra spaces

diff --git a/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
index af18d7b..a6af45f 100644
--- a/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_dir/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,7 +1,7 @@
 COMPILE_DEFINITIONS_<CONFIG>
 ----------------------------
 
-Ignored. See CMake Policy :policy:`CMP0043`.
+Ignored.  See CMake Policy :policy:`CMP0043`.
 
 Per-configuration preprocessor definitions in a directory.
 
diff --git a/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
index 4920f58..8487076 100644
--- a/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,7 +1,7 @@
 COMPILE_DEFINITIONS_<CONFIG>
 ----------------------------
 
-Ignored. See CMake Policy :policy:`CMP0043`.
+Ignored.  See CMake Policy :policy:`CMP0043`.
 
 Per-configuration preprocessor definitions on a source file.
 
diff --git a/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst b/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
index 1dba356..84bd5e4 100644
--- a/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
+++ b/Help/prop_tgt/COMPILE_DEFINITIONS_CONFIG.rst
@@ -1,7 +1,7 @@
 COMPILE_DEFINITIONS_<CONFIG>
 ----------------------------
 
-Ignored. See CMake Policy :policy:`CMP0043`.
+Ignored.  See CMake Policy :policy:`CMP0043`.
 
 Per-configuration preprocessor definitions on a target.
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8322676382b9a9443bb892044f7421e88ba7d21c
commit 8322676382b9a9443bb892044f7421e88ba7d21c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 21 19:36:18 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jul 21 19:41:51 2014 +0200

    Help: Flatten hierarchy in property documentation

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index f6a650e..17dadc2 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -7,12 +7,8 @@ cmake-properties(7)
 
    .. contents::
 
-Normal Properties
-=================
-These properties may be used freely in CMake projects.
-
 Properties of Global Scope
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+==========================
 
 .. toctree::
    :maxdepth: 1
@@ -46,7 +42,7 @@ Properties of Global Scope
    /prop_gbl/USE_FOLDERS
 
 Properties on Directories
-^^^^^^^^^^^^^^^^^^^^^^^^^
+=========================
 
 .. toctree::
    :maxdepth: 1
@@ -77,7 +73,7 @@ Properties on Directories
    /prop_dir/VS_GLOBAL_SECTION_PRE_section
 
 Properties on Targets
-^^^^^^^^^^^^^^^^^^^^^
+=====================
 
 .. toctree::
    :maxdepth: 1
@@ -245,7 +241,7 @@ Properties on Targets
    /prop_tgt/XCODE_ATTRIBUTE_an-attribute
 
 Properties on Tests
-^^^^^^^^^^^^^^^^^^^
+===================
 
 .. toctree::
    :maxdepth: 1
@@ -269,7 +265,7 @@ Properties on Tests
    /prop_test/WORKING_DIRECTORY
 
 Properties on Source Files
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+==========================
 
 .. toctree::
    :maxdepth: 1
@@ -296,7 +292,7 @@ Properties on Source Files
    /prop_sf/XCODE_LAST_KNOWN_FILE_TYPE
 
 Properties on Cache Entries
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+===========================
 
 .. toctree::
    :maxdepth: 1
@@ -309,7 +305,7 @@ Properties on Cache Entries
    /prop_cache/VALUE
 
 Properties on Installed Files
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=============================
 
 .. toctree::
    :maxdepth: 1
@@ -318,14 +314,8 @@ Properties on Installed Files
    /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
-^^^^^^^^^^^^^^^^^^^^^^^^^
+Deprecated Properties on Directories
+=====================================
 
 .. toctree::
    :maxdepth: 1
@@ -333,8 +323,8 @@ Properties on Directories
    /prop_dir/COMPILE_DEFINITIONS_CONFIG
 
 
-Properties on Targets
-^^^^^^^^^^^^^^^^^^^^^
+Deprecated Properties on Targets
+================================
 
 .. toctree::
    :maxdepth: 1
@@ -344,8 +334,8 @@ Properties on Targets
    /prop_tgt/PRE_INSTALL_SCRIPT
 
 
-Properties on Source Files
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+Deprecated Properties on Source Files
+=====================================
 
 .. toctree::
    :maxdepth: 1

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

Summary of changes:
 Help/manual/cmake-properties.7.rst           |   36 ++++++++++----------------
 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, 16 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list