Merge 527ba0ab72 into e461417f4e

src/_cpack

@@ -54,6 +54,9 @@ _cpack() {
     '--list-presets[List available package preset]' \
     '(- *)'{--version,-version}=-'[Print version number and exit]::format:(json-v1)' \
     '(- *)--help[Print usage information and exit]' \
+    '(- *)'{--version,-version}=-'[Print version number and exit]::format:(json-v1)' \
+    '(- *)'{--help,-help,-usage,-h,-H}'[Print usage information and exit]' \
+    '(- *)'{--version,-version}'[Print version number and exit]' \
     '(- *)--help-full[Print all help manuals and exit]' \
     '(- *)--help-manual[Print one help manual and exit]:manual:_cpack_help_manuals' \
     '(- *)--help-manual-list[List help manuals available and exit]' \

src/_ctest

@@ -113,6 +113,8 @@ _ctest() {
     '--no-compress-output[Do not compress test output when submitting]' \
     '--print-labels[Print all available test labels]' \
     '--no-tests=[Regard no tests]:type:(error ignore)' \
+    '(- *)'{-h,-H,--help,-usage}'[Print usage information and exit]' \
+    '(- *)'{--version,-version}=-'[Print version number and exit]::format:(json-v1)' \
     '(- *)'{--help,-help,-usage,-h,-H}'[Print usage information and exit]' \
     '(- *)'{--version,-version}'[Print version number and exit]' \
     '(- *)--help-full[Print all help manuals and exit]' \