[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-228-g6fc549f

[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  6fc549fd0f5c1ad49aab7beb0c9a8ea90d7f1aed (commit)
       via  797c3c54e835e5c5131f38036aca61b0dae02260 (commit)
       via  b08cae9b0e9bad96e4615c1bbf9bbd00802e6985 (commit)
       via  48cb388ead09794aae01328d83620e10a8f7636b (commit)
      from  78dddcaf7e33e7d70516901699c7315ed53e7eca (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fc549fd0f5c1ad49aab7beb0c9a8ea90d7f1aed
commit 6fc549fd0f5c1ad49aab7beb0c9a8ea90d7f1aed
Merge: 78dddca 797c3c5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 10 10:47:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 10 10:47:28 2016 -0400

    Merge topic 'bash-completion' into next
    
    797c3c54 bash-completion: Add cpack --help-{manual,module,policy,property}
    b08cae9b bash-completion: Add ctest --help-{manual,module,policy,property,variable}
    48cb388e bash-completion: Fix cmake --help-policy lookup


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=797c3c54e835e5c5131f38036aca61b0dae02260
commit 797c3c54e835e5c5131f38036aca61b0dae02260
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Jun 10 15:28:05 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 10 10:46:33 2016 -0400

    bash-completion: Add cpack --help-{manual,module,policy,property}

diff --git a/Auxiliary/bash-completion/cpack b/Auxiliary/bash-completion/cpack
index 05e0e93..cf5751f 100644
--- a/Auxiliary/bash-completion/cpack
+++ b/Auxiliary/bash-completion/cpack
@@ -48,6 +48,26 @@ _cpack()
                 grep -v "^cpack version " )' -- "$cur" ) )
             return
             ;;
+        --help-manual)
+            COMPREPLY=( $( compgen -W '$( cpack --help-manual-list 2>/dev/null|
+                grep -v "^cpack version " | sed -e "s/([0-9])$//" )' -- "$cur" ) )
+            return
+            ;;
+        --help-module)
+            COMPREPLY=( $( compgen -W '$( cpack --help-module-list 2>/dev/null|
+                grep -v "^cpack version " )' -- "$cur" ) )
+            return
+            ;;
+        --help-policy)
+            COMPREPLY=( $( compgen -W '$( cpack --help-policy-list 2>/dev/null |
+                grep -v "^cpack version " )' -- "$cur" ) )
+            return
+            ;;
+        --help-property)
+            COMPREPLY=( $( compgen -W '$( cpack --help-property-list \
+                2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) )
+            return
+            ;;
         --help-variable)
             COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \
                 2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) )

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b08cae9b0e9bad96e4615c1bbf9bbd00802e6985
commit b08cae9b0e9bad96e4615c1bbf9bbd00802e6985
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Jun 10 15:28:05 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 10 10:46:19 2016 -0400

    bash-completion: Add ctest --help-{manual,module,policy,property,variable}

diff --git a/Auxiliary/bash-completion/ctest b/Auxiliary/bash-completion/ctest
index 387672a..49343bb 100644
--- a/Auxiliary/bash-completion/ctest
+++ b/Auxiliary/bash-completion/ctest
@@ -72,11 +72,37 @@ _ctest()
             COMPREPLY=( $( compgen -W '0 1' -- "$cur" ) )
             return
             ;;
+
         --help-command)
             COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null|
                 grep -v "^ctest version " )' -- "$cur" ) )
             return
             ;;
+        --help-manual)
+            COMPREPLY=( $( compgen -W '$( ctest --help-manual-list 2>/dev/null|
+                grep -v "^ctest version " | sed -e "s/([0-9])$//" )' -- "$cur" ) )
+            return
+            ;;
+        --help-module)
+            COMPREPLY=( $( compgen -W '$( ctest --help-module-list 2>/dev/null|
+                grep -v "^ctest version " )' -- "$cur" ) )
+            return
+            ;;
+        --help-policy)
+            COMPREPLY=( $( compgen -W '$( ctest --help-policy-list 2>/dev/null |
+                grep -v "^ctest version " )' -- "$cur" ) )
+            return
+            ;;
+        --help-property)
+            COMPREPLY=( $( compgen -W '$( ctest --help-property-list \
+                2>/dev/null | grep -v "^ctest version " )' -- "$cur" ) )
+            return
+            ;;
+        --help-variable)
+            COMPREPLY=( $( compgen -W '$( ctest --help-variable-list \
+                2>/dev/null | grep -v "^ctest version " )' -- "$cur" ) )
+            return
+            ;;
     esac
 
     if [[ "$cur" == -* ]]; then

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48cb388ead09794aae01328d83620e10a8f7636b
commit 48cb388ead09794aae01328d83620e10a8f7636b
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Jun 10 15:28:05 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 10 10:45:25 2016 -0400

    bash-completion: Fix cmake --help-policy lookup

diff --git a/Auxiliary/bash-completion/cmake b/Auxiliary/bash-completion/cmake
index 6997d47..6061129 100644
--- a/Auxiliary/bash-completion/cmake
+++ b/Auxiliary/bash-completion/cmake
@@ -132,8 +132,8 @@ _cmake()
             return
             ;;
          --help-policy)
-            COMPREPLY=( $( compgen -W '$( cmake --help-policies 2>/dev/null |
-                grep "^  CMP" 2>/dev/null )' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '$( cmake --help-policy-list 2>/dev/null |
+                grep -v "^cmake version " )' -- "$cur" ) )
             return
             ;;
          --help-property)

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

Summary of changes:


hooks/post-receive
-- 
CMake