[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3362-gb51d32e

[Brad King]

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  b51d32e34991244326e1bae7c54659738657a518 (commit)
       via  e971360feef6788f36bc9475ae217e67e21c0aff (commit)
      from  762a2154d6973eea7cb0b21ac09e216cde93a9d0 (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=b51d32e34991244326e1bae7c54659738657a518
commit b51d32e34991244326e1bae7c54659738657a518
Merge: 762a215 e971360
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 09:45:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 27 09:45:53 2014 -0400

    Merge topic 'cpack-properties' into next
    
    e971360f Utilities/Sphinx: Finish prop_inst domain object type


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e971360feef6788f36bc9475ae217e67e21c0aff
commit e971360feef6788f36bc9475ae217e67e21c0aff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 09:43:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 09:44:56 2014 -0400

    Utilities/Sphinx: Finish prop_inst domain object type
    
    Mention it in our documentation, add it to cmRST, and sort it in
    lexicographic order in the implementation.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 7f31970..f3af1e7 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -331,10 +331,10 @@ documentation:
  See the :manual:`cmake-policies(7)` manual
  and the :command:`cmake_policy` command.
 
-``prop_cache, prop_dir, prop_gbl, prop_sf, prop_test, prop_tgt``
- A CMake cache, directory, global, source file, test, or target
- property, respectively.  See the :manual:`cmake-properties(7)` manual
- and the :command:`set_property` command.
+``prop_cache, prop_dir, prop_gbl, prop_sf, prop_inst, prop_test, prop_tgt``
+ A CMake cache, directory, global, source file, installed file, test,
+ or target property, respectively.  See the :manual:`cmake-properties(7)`
+ manual and the :command:`set_property` command.
 
 ``variable``
  A CMake language variable.
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 7ff12dd..cca995b 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -39,7 +39,8 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
   ModuleRST("^#\\[(=*)\\[\\.rst:$"),
   CMakeRole("(:cmake)?:("
             "command|generator|variable|module|policy|"
-            "prop_cache|prop_dir|prop_gbl|prop_sf|prop_test|prop_tgt|"
+            "prop_cache|prop_dir|prop_gbl|prop_inst|prop_sf|"
+            "prop_test|prop_tgt|"
             "manual"
             "):`(<*([^`<]|[^` \t]<)*)([ \t]+<[^`]*>)?`"),
   Substitution("(^|[^A-Za-z0-9_])"
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 1076caa..2629bb3 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -142,10 +142,10 @@ _cmake_index_objs = {
     'prop_cache': _cmake_index_entry('cache property'),
     'prop_dir':   _cmake_index_entry('directory property'),
     'prop_gbl':   _cmake_index_entry('global property'),
+    'prop_inst':  _cmake_index_entry('installed file property'),
     'prop_sf':    _cmake_index_entry('source file property'),
     'prop_test':  _cmake_index_entry('test property'),
     'prop_tgt':   _cmake_index_entry('target property'),
-    'prop_inst':  _cmake_index_entry('installed file property'),
     'variable':   _cmake_index_entry('variable'),
     }
 
@@ -270,10 +270,10 @@ class CMakeDomain(Domain):
         'prop_cache': ObjType('prop_cache', 'prop_cache'),
         'prop_dir':   ObjType('prop_dir',   'prop_dir'),
         'prop_gbl':   ObjType('prop_gbl',   'prop_gbl'),
+        'prop_inst':  ObjType('prop_inst',  'prop_inst'),
         'prop_sf':    ObjType('prop_sf',    'prop_sf'),
         'prop_test':  ObjType('prop_test',  'prop_test'),
         'prop_tgt':   ObjType('prop_tgt',   'prop_tgt'),
-        'prop_inst':  ObjType('prop_inst',  'prop_inst'),
         'manual':     ObjType('manual',     'manual'),
     }
     directives = {
@@ -286,10 +286,10 @@ class CMakeDomain(Domain):
         # 'prop_cache': CMakeObject,
         # 'prop_dir':   CMakeObject,
         # 'prop_gbl':   CMakeObject,
+        # 'prop_inst':  CMakeObject,
         # 'prop_sf':    CMakeObject,
         # 'prop_test':  CMakeObject,
         # 'prop_tgt':   CMakeObject,
-        # 'prop_inst':  CMakeObject,
         # 'manual':     CMakeObject,
     }
     roles = {
@@ -301,10 +301,10 @@ class CMakeDomain(Domain):
         'prop_cache': CMakeXRefRole(),
         'prop_dir':   CMakeXRefRole(),
         'prop_gbl':   CMakeXRefRole(),
+        'prop_inst':  CMakeXRefRole(),
         'prop_sf':    CMakeXRefRole(),
         'prop_test':  CMakeXRefRole(),
         'prop_tgt':   CMakeXRefRole(),
-        'prop_inst':  CMakeXRefRole(),
         'manual':     CMakeXRefRole(),
     }
     initial_data = {

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

Summary of changes:
 Help/manual/cmake-developer.7.rst |    8 ++++----
 Source/cmRST.cxx                  |    3 ++-
 Utilities/Sphinx/cmake.py         |    8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake