commit 358969d05331b70df02521bf2aad42e841085d2c Author: Björn Esser Date: Tue Aug 23 13:35:29 2016 +0200 cmake3-rename.patch diff --git a/Auxiliary/CMakeLists.txt b/Auxiliary/CMakeLists.txt index c003b28..f1e9f42 100644 --- a/Auxiliary/CMakeLists.txt +++ b/Auxiliary/CMakeLists.txt @@ -1,4 +1,7 @@ -install(DIRECTORY vim/indent vim/syntax DESTINATION ${CMAKE_DATA_DIR}/editors/vim) -install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs) -install(FILES cmake.m4 DESTINATION ${CMAKE_XDGDATA_DIR}/aclocal) +#foreach(_file cmake-help.vim cmake-indent.vim cmake-syntax.vim) +# string(REPLACE "cmake" "cmake3" new_name "${_file}") +# install(FILES ${_file} DESTINATION ${CMAKE_DATA_DIR}/editors/vim RENAME ${new_name}) +#endforeach(_file cmake-help.vim cmake-indent.vim cmake-syntax.vim) +install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs RENAME cmake3-mode.el) +install(FILES cmake.m4 DESTINATION share/aclocal RENAME cmake3.m4) add_subdirectory (bash-completion) diff --git a/Auxiliary/bash-completion/CMakeLists.txt b/Auxiliary/bash-completion/CMakeLists.txt index c0a8899..bb7ce47 100644 --- a/Auxiliary/bash-completion/CMakeLists.txt +++ b/Auxiliary/bash-completion/CMakeLists.txt @@ -5,4 +5,7 @@ # add symlinks to the files in appropriate places # /etc/bash_completion.d/ # DATADIR/completions (may be /usr/share//completions -install(FILES cmake cpack ctest DESTINATION ${CMAKE_DATA_DIR}/completions) +foreach(_file cmake cpack ctest) + set(new_name "${_file}3") + install(FILES "${_file}" DESTINATION ${CMAKE_DATA_DIR}/completions RENAME ${new_name}) +endforeach(_file cmake cpack ctest) diff --git a/Auxiliary/bash-completion/cmake b/Auxiliary/bash-completion/cmake index 6061129..5e6277e 100644 --- a/Auxiliary/bash-completion/cmake +++ b/Auxiliary/bash-completion/cmake @@ -1,6 +1,6 @@ -# bash completion for cmake(1) -*- shell-script -*- +# bash completion for cmake3(1) -*- shell-script -*- -_cmake() +_cmake3() { local cur prev words cword split=false if type -t _init_completion >/dev/null; then @@ -42,7 +42,7 @@ _cmake() type="${cur#*:}" type="${type%%=*}" else # get type from cache if it's not set explicitly - type=$( cmake -LA -N 2>/dev/null | grep "$var:" \ + type=$( cmake3 -LA -N 2>/dev/null | grep "$var:" \ 2>/dev/null ) type="${type#*:}" type="${type%%=*}" @@ -76,14 +76,14 @@ _cmake() compopt -o nospace else # complete variable names - COMPREPLY=( $( compgen -W '$( cmake -LA -N | tail -n +2 | + COMPREPLY=( $( compgen -W '$( cmake3 -LA -N | tail -n +2 | cut -f1 -d: )' -P "$prefix" -- "$cur" ) ) compopt -o nospace fi return ;; -U) - COMPREPLY=( $( compgen -W '$( cmake -LA -N | tail -n +2 | + COMPREPLY=( $( compgen -W '$( cmake3 -LA -N | tail -n +2 | cut -f1 -d: )' -P "$prefix" -- "$cur" ) ) return ;; @@ -101,7 +101,7 @@ return ;; -E) - COMPREPLY=( $( compgen -W "$( cmake -E help |& sed -n \ + COMPREPLY=( $( compgen -W "$( cmake3 -E help |& sed -n \ '/^ [^ ]/{s|^ \([^ ]\{1,\}\) .*$|\1|;p}' 2>/dev/null )" \ -- "$cur" ) ) return @@ -110,40 +110,40 @@ _cmake() local IFS=$'\n' local quoted printf -v quoted %q "$cur" - COMPREPLY=( $( compgen -W '$( cmake --help 2>/dev/null | sed -n \ + COMPREPLY=( $( compgen -W '$( cmake3 --help 2>/dev/null | sed -n \ -e "1,/^Generators/d" \ -e "/^ *[^ =]/{s|^ *\([^=]*[^ =]\).*$|\1|;s| |\\\\ |g;p}" \ 2>/dev/null )' -- "$quoted" ) ) return ;; --help-command) - COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| - grep -v "^cmake version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-command-list 2>/dev/null| + grep -v "^cmake3 version " )' -- "$cur" ) ) return ;; --help-manual) - COMPREPLY=( $( compgen -W '$( cmake --help-manual-list 2>/dev/null| - grep -v "^cmake version " | sed -e "s/([0-9])$//" )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-manual-list 2>/dev/null| + grep -v "^cmake3 version " | sed -e "s/([0-9])$//" )' -- "$cur" ) ) return ;; --help-module) - COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null| - grep -v "^cmake version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-module-list 2>/dev/null| + grep -v "^cmake3 version " )' -- "$cur" ) ) return ;; --help-policy) - COMPREPLY=( $( compgen -W '$( cmake --help-policy-list 2>/dev/null | - grep -v "^cmake version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-policy-list 2>/dev/null | + grep -v "^cmake3 version " )' -- "$cur" ) ) return ;; --help-property) - COMPREPLY=( $( compgen -W '$( cmake --help-property-list \ - 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-property-list \ + 2>/dev/null | grep -v "^cmake3 version " )' -- "$cur" ) ) return ;; --help-variable) - COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ - 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cmake3 --help-variable-list \ + 2>/dev/null | grep -v "^cmake3 version " )' -- "$cur" ) ) return ;; esac @@ -158,6 +158,6 @@ _cmake() _filedir } && -complete -F _cmake cmake +complete -F _cmake3 cmake3 # ex: ts=4 sw=4 et filetype=sh diff --git a/Auxiliary/bash-completion/cpack b/Auxiliary/bash-completion/cpack index cf5751f..1ed1b71 100644 --- a/Auxiliary/bash-completion/cpack +++ b/Auxiliary/bash-completion/cpack @@ -1,6 +1,6 @@ -# bash completion for cpack(1) -*- shell-script -*- +# bash completion for cpack3(1) -*- shell-script -*- -_cpack() +_cpack3() { local cur prev words cword if type -t _init_completion >/dev/null; then @@ -14,7 +14,7 @@ _cpack() case "$prev" in -G) - COMPREPLY=( $( compgen -W '$( cpack --help 2>/dev/null | + COMPREPLY=( $( compgen -W '$( cpack3 --help 2>/dev/null | sed -e "1,/^Generators/d" -e "s|^ *\([^ ]*\) .*$|\1|" \ 2>/dev/null )' -- "$cur" ) ) return @@ -26,8 +26,8 @@ _cpack() ;; -D) [[ $cur == *=* ]] && return # no completion for values - COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ - 2>/dev/null | grep -v "^cpack version " )' -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cpack3 --help-variable-list \ + 2>/dev/null | grep -v "^cpack3 version " )' -S = -- "$cur" ) ) compopt -o nospace return ;; @@ -44,8 +44,8 @@ _cpack() return ;; --help-command) - COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null| - grep -v "^cpack version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cpack3 --help-command-list 2>/dev/null| + grep -v "^cpack3 version " )' -- "$cur" ) ) return ;; --help-manual) @@ -69,8 +69,8 @@ _cpack() return ;; --help-variable) - COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ - 2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( cpack3 --help-variable-list \ + 2>/dev/null | grep -v "^cpack3 version " )' -- "$cur" ) ) return ;; esac @@ -83,6 +83,6 @@ _cpack() _filedir } && -complete -F _cpack cpack +complete -F _cpack3 cpack3 # ex: ts=4 sw=4 et filetype=sh diff --git a/Auxiliary/bash-completion/ctest b/Auxiliary/bash-completion/ctest index 49343bb..69affe4 100644 --- a/Auxiliary/bash-completion/ctest +++ b/Auxiliary/bash-completion/ctest @@ -1,6 +1,6 @@ -# bash completion for ctest(1) -*- shell-script -*- +# bash completion for ctest3(1) -*- shell-script -*- -_ctest() +_ctest3() { local cur prev words cword if type -t _init_completion >/dev/null; then @@ -27,7 +27,7 @@ _ctest() return ;; -L|--label-regex|-LE|--label-exclude) - COMPREPLY=( $( compgen -W '$( ctest --print-labels 2>/dev/null | + COMPREPLY=( $( compgen -W '$( ctest3 --print-labels 2>/dev/null | grep "^ " 2>/dev/null | cut -d" " -f 3 )' -- "$cur" ) ) return ;; @@ -36,7 +36,7 @@ _ctest() return ;; -R|--tests-regex|-E|--exclude-regex) - COMPREPLY=( $( compgen -W '$( ctest -N 2>/dev/null | + COMPREPLY=( $( compgen -W '$( ctest3 -N 2>/dev/null | grep "^ Test" 2>/dev/null | cut -d: -f 2 )' -- "$cur" ) ) return ;; @@ -65,7 +65,7 @@ _ctest() return ;; -S|--script|-SP|--script-new-process) - _filedir '@(cmake|ctest)' + _filedir '@(cmake3|ctest3)' return ;; --interactive-debug-mode) @@ -74,8 +74,8 @@ _ctest() ;; --help-command) - COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null| - grep -v "^ctest version " )' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '$( ctest3 --help-command-list 2>/dev/null| + grep -v "^ctest3 version " )' -- "$cur" ) ) return ;; --help-manual) @@ -113,6 +113,6 @@ _ctest() _filedir } && -complete -F _ctest ctest +complete -F _ctest3 ctest3 # ex: ts=4 sw=4 et filetype=sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 787f319..3ef8605 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,17 +176,17 @@ macro(CMAKE_SETUP_TESTING) # and not the ctest from the cmake building and testing # cmake. if(CMake_TEST_EXTERNAL_CMAKE) - set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest") - set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake") - set(CMAKE_CPACK_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cpack") + set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest3") + set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake3") + set(CMAKE_CPACK_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cpack3") foreach(exe cmake ctest cpack) add_executable(${exe} IMPORTED) set_property(TARGET ${exe} PROPERTY IMPORTED_LOCATION ${CMake_TEST_EXTERNAL_CMAKE}/${exe}) endforeach() else() - set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest") - set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake") - set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack") + set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest3") + set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake3") + set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack3") endif() endif() diff --git a/Help/command/add_compile_options.rst b/Help/command/add_compile_options.rst index 3fe2a33..eff73aa 100644 --- a/Help/command/add_compile_options.rst +++ b/Help/command/add_compile_options.rst @@ -18,8 +18,8 @@ (:command:`target_include_directories` and :command:`include_directories`). Arguments to ``add_compile_options`` may use "generator expressions" with -the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. .. include:: COMPILE_OPTIONS_SHELL.txt diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst index d421364..34d3a12 100644 --- a/Help/command/add_custom_command.rst +++ b/Help/command/add_custom_command.rst @@ -83,7 +83,7 @@ The options are: also be prepended to the command to allow the executable to run on the host. (Use the ``TARGET_FILE`` - :manual:`generator expression ` to + :manual:`generator expression ` to reference an executable later in the command line.) Additionally a target-level dependency will be added so that the executable target will be built before any target using this custom @@ -92,7 +92,7 @@ The options are: recompiled. Arguments to ``COMMAND`` may use - :manual:`generator expressions `. + :manual:`generator expressions `. References to target names in generator expressions imply target-level dependencies, but NOT file-level dependencies. List target names with the ``DEPENDS`` option to add file-level dependencies. @@ -121,7 +121,7 @@ recompiled. Arguments to ``DEPENDS`` may use - :manual:`generator expressions `. + :manual:`generator expressions `. ``COMMAND_EXPAND_LISTS`` Lists in ``COMMAND`` arguments will be expanded, including those diff --git a/Help/command/add_custom_target.rst b/Help/command/add_custom_target.rst index 6980d61..2e17ded 100644 --- a/Help/command/add_custom_target.rst +++ b/Help/command/add_custom_target.rst @@ -68,7 +68,7 @@ The options are: executable target will be built before this custom target. Arguments to ``COMMAND`` may use - :manual:`generator expressions `. + :manual:`generator expressions `. References to target names in generator expressions imply target-level dependencies. diff --git a/Help/command/add_definitions.rst b/Help/command/add_definitions.rst index a04faf5..4e0cb02 100644 --- a/Help/command/add_definitions.rst +++ b/Help/command/add_definitions.rst @@ -23,5 +23,5 @@ backwards compatibility. See documentation of the properties for details on adding preprocessor definitions to specific scopes and configurations. -See the :manual:`cmake-buildsystem(7)` manual for more on defining +See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. diff --git a/Help/command/add_executable.rst b/Help/command/add_executable.rst index 19ca658..00da2b2 100644 --- a/Help/command/add_executable.rst +++ b/Help/command/add_executable.rst @@ -37,8 +37,8 @@ target property for details. Source arguments to ``add_executable`` may use "generator expressions" with -the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. See also :prop_sf:`HEADER_FILE_ONLY` on what to do if some sources are diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index 36adcbe..bc7ca75 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -56,8 +56,8 @@ target property for details. Source arguments to ``add_library`` may use "generator expressions" with -the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. See also :prop_sf:`HEADER_FILE_ONLY` on what to do if some sources are diff --git a/Help/command/add_test.rst b/Help/command/add_test.rst index d8a96e9..9329d3f 100644 --- a/Help/command/add_test.rst +++ b/Help/command/add_test.rst @@ -1,7 +1,7 @@ add_test -------- -Add a test to the project to be run by :manual:`ctest(1)`. +Add a test to the project to be run by :manual:`ctest3(1)`. :: @@ -31,13 +31,13 @@ quotes, or other characters special in CMake syntax. The options are: The given test command is expected to exit with code ``0`` to pass and non-zero to fail, or vice-versa if the :prop_test:`WILL_FAIL` test property is set. Any output written to stdout or stderr will be -captured by :manual:`ctest(1)` but does not affect the pass/fail status +captured by :manual:`ctest3(1)` but does not affect the pass/fail status unless the :prop_test:`PASS_REGULAR_EXPRESSION` or :prop_test:`FAIL_REGULAR_EXPRESSION` test property is used. The ``COMMAND`` and ``WORKING_DIRECTORY`` options may use "generator expressions" with the syntax ``$<...>``. See the -:manual:`cmake-generator-expressions(7)` manual for available expressions. +:manual:`cmake3-generator-expressions(7)` manual for available expressions. Example usage:: diff --git a/Help/command/build_command.rst b/Help/command/build_command.rst index b83edaf..4194516 100644 --- a/Help/command/build_command.rst +++ b/Help/command/build_command.rst @@ -16,7 +16,7 @@ Sets the given ```` to a command-line string of the form:: --build . [--config ] [--target ] [-- -i] -where ```` is the location of the :manual:`cmake(1)` command-line +where ```` is the location of the :manual:`cmake3(1)` command-line tool, and ```` and ```` are the values provided to the ``CONFIGURATION`` and ``TARGET`` options, if any. The trailing ``-- -i`` option is added for :ref:`Makefile Generators` if policy :policy:`CMP0061` diff --git a/Help/command/cmake_policy.rst b/Help/command/cmake_policy.rst index b51b951..bfe8c41 100644 --- a/Help/command/cmake_policy.rst +++ b/Help/command/cmake_policy.rst @@ -1,7 +1,7 @@ cmake_policy ------------ -Manage CMake Policy settings. See the :manual:`cmake-policies(7)` +Manage CMake Policy settings. See the :manual:`cmake3-policies(7)` manual for defined policies. As CMake evolves it is sometimes necessary to change existing behavior diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index e1b7793..ce796ac 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -36,7 +36,7 @@ The options are: ``CONFIGURATION `` Specify the build configuration (e.g. ``Debug``). If not specified the ``CTEST_BUILD_CONFIGURATION`` variable will be checked. - Otherwise the ``-C `` option given to the :manual:`ctest(1)` + Otherwise the ``-C `` option given to the :manual:`ctest3(1)` command will be used, if any. ``FLAGS `` diff --git a/Help/command/ctest_read_custom_files.rst b/Help/command/ctest_read_custom_files.rst index cf8e17a..04b8e0e 100644 --- a/Help/command/ctest_read_custom_files.rst +++ b/Help/command/ctest_read_custom_files.rst @@ -10,5 +10,5 @@ read CTestCustom files. Read all the CTestCustom.ctest or CTestCustom.cmake files from the given directory. -By default, invoking :manual:`ctest(1)` without a script will read custom +By default, invoking :manual:`ctest3(1)` without a script will read custom files from the binary directory. diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst index 412e323..e2d0425 100644 --- a/Help/command/ctest_test.rst +++ b/Help/command/ctest_test.rst @@ -66,7 +66,7 @@ The options are: While running tests in parallel, try not to start tests when they may cause the CPU load to pass above a given threshold. If not specified the :variable:`CTEST_TEST_LOAD` variable will be checked, - and then the ``--test-load`` command-line argument to :manual:`ctest(1)`. + and then the ``--test-load`` command-line argument to :manual:`ctest3(1)`. See also the ``TestLoad`` setting in the :ref:`CTest Test Step`. ``SCHEDULE_RANDOM `` diff --git a/Help/command/file.rst b/Help/command/file.rst index 256d16d..fd51aca 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -268,8 +268,8 @@ the ```` and ``UTC`` options. [CONDITION expression]) Generate an output file for each build configuration supported by the current -:manual:`CMake Generator `. Evaluate -:manual:`generator expressions ` +:manual:`CMake Generator `. Evaluate +:manual:`generator expressions ` from the input content to produce the output content. The options are: ``CONDITION `` diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 58dff9d..a05e123 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -305,7 +305,7 @@ This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed or by setting the :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` to ``TRUE``. - See the :manual:`cmake-packages(7)` manual for details on the user + See the :manual:`cmake3-packages(7)` manual for details on the user package registry. 7. Search cmake variables defined in the Platform files for the @@ -320,7 +320,7 @@ This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed or by setting the :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` to ``TRUE``. - See the :manual:`cmake-packages(7)` manual for details on the system + See the :manual:`cmake3-packages(7)` manual for details on the system package registry. 9. Search paths specified by the ``PATHS`` option. These are typically diff --git a/Help/command/get_cmake_property.rst b/Help/command/get_cmake_property.rst index 3a6fb41..7fcd228 100644 --- a/Help/command/get_cmake_property.rst +++ b/Help/command/get_cmake_property.rst @@ -9,7 +9,7 @@ Get a global property from the CMake instance. The value of the property is stored in the variable ``VAR``. If the property is not found, ``VAR`` -will be set to "NOTFOUND". See the :manual:`cmake-properties(7)` manual +will be set to "NOTFOUND". See the :manual:`cmake3-properties(7)` manual for available properties. See also the :command:`get_property` command ``GLOBAL`` option. diff --git a/Help/command/include_directories.rst b/Help/command/include_directories.rst index f694934..a73d296 100644 --- a/Help/command/include_directories.rst +++ b/Help/command/include_directories.rst @@ -30,6 +30,6 @@ skipping warnings, or these fixed-install system files not being considered in dependency calculations - see compiler docs. Arguments to ``include_directories`` may use "generator expressions" with -the syntax "$<...>". See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +the syntax "$<...>". See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. diff --git a/Help/command/install.rst b/Help/command/install.rst index aaf12cc..9c14777 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -171,7 +171,7 @@ set to ``TRUE`` has undefined behavior. The install destination given to the target install ``DESTINATION`` may use "generator expressions" with the syntax ``$<...>``. See the -:manual:`cmake-generator-expressions(7)` manual for available expressions. +:manual:`cmake3-generator-expressions(7)` manual for available expressions. Installing Files ^^^^^^^^^^^^^^^^ @@ -198,13 +198,13 @@ form to install targets built within the project. The list of ``files...`` given to ``FILES`` or ``PROGRAMS`` may use "generator expressions" with the syntax ``$<...>``. See the -:manual:`cmake-generator-expressions(7)` manual for available expressions. +:manual:`cmake3-generator-expressions(7)` manual for available expressions. However, if any item begins in a generator expression it must evaluate to a full path. The install destination given to the files install ``DESTINATION`` may use "generator expressions" with the syntax ``$<...>``. See the -:manual:`cmake-generator-expressions(7)` manual for available expressions. +:manual:`cmake3-generator-expressions(7)` manual for available expressions. Installing Directories ^^^^^^^^^^^^^^^^^^^^^^ @@ -284,7 +284,7 @@ file permissions, the scripts will be given specific permissions, and any The list of ``dirs...`` given to ``DIRECTORY`` and the install destination given to the directory install ``DESTINATION`` may use "generator expressions" -with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` +with the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` manual for available expressions. Custom Installation Logic diff --git a/Help/command/set.rst b/Help/command/set.rst index d04b880..3ca46a6 100644 --- a/Help/command/set.rst +++ b/Help/command/set.rst @@ -2,7 +2,7 @@ set --- Set a normal, cache, or environment variable to a given value. -See the :ref:`cmake-language(7) variables ` +See the :ref:`cmake3-language(7) variables ` documentation for the scopes and interaction of normal variables and cache entries. @@ -42,26 +42,26 @@ overwrite existing entries. The ```` must be specified as one of: ``BOOL`` - Boolean ``ON/OFF`` value. :manual:`cmake-gui(1)` offers a checkbox. + Boolean ``ON/OFF`` value. :manual:`cmake3-gui(1)` offers a checkbox. ``FILEPATH`` - Path to a file on disk. :manual:`cmake-gui(1)` offers a file dialog. + Path to a file on disk. :manual:`cmake3-gui(1)` offers a file dialog. ``PATH`` - Path to a directory on disk. :manual:`cmake-gui(1)` offers a file dialog. + Path to a directory on disk. :manual:`cmake3-gui(1)` offers a file dialog. ``STRING`` - A line of text. :manual:`cmake-gui(1)` offers a text field or a + A line of text. :manual:`cmake3-gui(1)` offers a text field or a drop-down selection if the :prop_cache:`STRINGS` cache entry property is set. ``INTERNAL`` - A line of text. :manual:`cmake-gui(1)` does not show internal entries. + A line of text. :manual:`cmake3-gui(1)` does not show internal entries. They may be used to store variables persistently across runs. Use of this type implies ``FORCE``. The ```` must be specified as a line of text providing -a quick summary of the option for presentation to :manual:`cmake-gui(1)` +a quick summary of the option for presentation to :manual:`cmake3-gui(1)` users. If the cache entry does not exist prior to the call or the ``FORCE`` @@ -71,7 +71,7 @@ be removed to expose the newly cached value to any immediately following evaluation. It is possible for the cache entry to exist prior to the call but -have no type set if it was created on the :manual:`cmake(1)` command +have no type set if it was created on the :manual:`cmake3(1)` command line by a user through the ``-D=`` option without specifying a type. In this case the ``set`` command will add the type. Furthermore, if the ```` is ``PATH`` or ``FILEPATH`` diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst index 5ed788e..ab8f0be 100644 --- a/Help/command/set_property.rst +++ b/Help/command/set_property.rst @@ -71,5 +71,5 @@ directly set in the nominated scope, the command will behave as though ``APPEND`` or ``APPEND_STRING`` had not been given. -See the :manual:`cmake-properties(7)` manual for a list of properties +See the :manual:`cmake3-properties(7)` manual for a list of properties in each scope. diff --git a/Help/command/set_tests_properties.rst b/Help/command/set_tests_properties.rst index 3efb165..8de8e2a 100644 --- a/Help/command/set_tests_properties.rst +++ b/Help/command/set_tests_properties.rst @@ -9,6 +9,6 @@ Set a property of the tests. Set a property for the tests. If the test is not found, CMake will report an error. -:manual:`Generator expressions ` will be +:manual:`Generator expressions ` will be expanded the same as supported by the test's :command:`add_test` call. See :ref:`Test Properties` for the list of properties known to CMake. diff --git a/Help/command/string.rst b/Help/command/string.rst index 3f4050e..6f70fbf 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -189,7 +189,7 @@ GENEX_STRIP string(GENEX_STRIP ) -Strip any :manual:`generator expressions ` +Strip any :manual:`generator expressions ` from the ``input string`` and store the result in the ``output variable``. Comparison diff --git a/Help/command/target_compile_definitions.rst b/Help/command/target_compile_definitions.rst index 8bd3233..c7eeb03 100644 --- a/Help/command/target_compile_definitions.rst +++ b/Help/command/target_compile_definitions.rst @@ -24,8 +24,8 @@ same ```` append items in the order called. Arguments to ``target_compile_definitions`` may use "generator expressions" -with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +with the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. Any leading ``-D`` on an item will be removed. Empty items are ignored. diff --git a/Help/command/target_compile_features.rst b/Help/command/target_compile_features.rst index b66a4ec..148a8f5 100644 --- a/Help/command/target_compile_features.rst +++ b/Help/command/target_compile_features.rst @@ -27,6 +27,6 @@ an ``IMPORTED`` target. Arguments to ``target_compile_features`` may use "generator expressions" with the syntax ``$<...>``. -See the :manual:`cmake-generator-expressions(7)` manual for available -expressions. See the :manual:`cmake-compile-features(7)` manual for +See the :manual:`cmake3-generator-expressions(7)` manual for available +expressions. See the :manual:`cmake3-compile-features(7)` manual for information on compile features and a list of supported compilers. diff --git a/Help/command/target_compile_options.rst b/Help/command/target_compile_options.rst index 73e01e7..542c589 100644 --- a/Help/command/target_compile_options.rst +++ b/Help/command/target_compile_options.rst @@ -35,8 +35,8 @@ ```` append items in the order called. Arguments to ``target_compile_options`` may use "generator expressions" -with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +with the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. .. include:: COMPILE_OPTIONS_SHELL.txt diff --git a/Help/command/target_include_directories.rst b/Help/command/target_include_directories.rst index 30ec2cb..80e9885 100644 --- a/Help/command/target_include_directories.rst +++ b/Help/command/target_include_directories.rst @@ -37,8 +37,8 @@ is used together with ``PUBLIC`` or ``INTERFACE``, the populated with the specified directories. Arguments to ``target_include_directories`` may use "generator expressions" -with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +with the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. Include directories usage requirements commonly differ between the build-tree diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst index d903d05..1bc7856 100644 --- a/Help/command/target_link_libraries.rst +++ b/Help/command/target_link_libraries.rst @@ -81,8 +81,8 @@ See policy :policy:`CMP0028`. Arguments to ``target_link_libraries`` may use "generator expressions" with the syntax ``$<...>``. Note however, that generator expressions will not be used in OLD handling of :policy:`CMP0003` or :policy:`CMP0004`. -See the :manual:`cmake-generator-expressions(7)` manual for available -expressions. See the :manual:`cmake-buildsystem(7)` manual for more on +See the :manual:`cmake3-generator-expressions(7)` manual for available +expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. Libraries for a Target and/or its Dependents diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst index d6f148d..4ebbac8 100644 --- a/Help/command/target_sources.rst +++ b/Help/command/target_sources.rst @@ -23,6 +23,6 @@ following arguments specify sources. Repeated calls for the same ```` append items in the order called. Arguments to ``target_sources`` may use "generator expressions" -with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` -manual for available expressions. See the :manual:`cmake-buildsystem(7)` +with the syntax ``$<...>``. See the :manual:`cmake3-generator-expressions(7)` +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index 7830deb..50693bb 100644 --- a/Help/command/try_compile.rst +++ b/Help/command/try_compile.rst @@ -55,7 +55,7 @@ The options are: ``CMAKE_FLAGS ...`` Specify flags of the form ``-DVAR:TYPE=VALUE`` to be passed to - the ``cmake`` command-line used to drive the test build. + the ``cmake3`` command-line used to drive the test build. The above example shows how values for variables ``INCLUDE_DIRECTORIES``, ``LINK_DIRECTORIES``, and ``LINK_LIBRARIES`` are used. @@ -84,7 +84,7 @@ The options are: In this version all files in ``/CMakeFiles/CMakeTmp`` will be cleaned automatically. For debugging, ``--debug-trycompile`` can be -passed to ``cmake`` to avoid this clean. However, multiple sequential +passed to ``cmake3`` to avoid this clean. However, multiple sequential ``try_compile`` operations reuse this single output directory. If you use ``--debug-trycompile``, you can only debug one ``try_compile`` call at a time. The recommended procedure is to protect all ``try_compile`` calls in your diff --git a/Help/command/try_run.rst b/Help/command/try_run.rst index e3bd57d..995d84e 100644 --- a/Help/command/try_run.rst +++ b/Help/command/try_run.rst @@ -32,7 +32,7 @@ The options are: ``CMAKE_FLAGS ...`` Specify flags of the form ``-DVAR:TYPE=VALUE`` to be passed to - the ``cmake`` command-line used to drive the test build. + the ``cmake3`` command-line used to drive the test build. The example in :command:`try_compile` shows how values for variables ``INCLUDE_DIRECTORIES``, ``LINK_DIRECTORIES``, and ``LINK_LIBRARIES`` are used. diff --git a/Help/manual/ccmake.1.rst b/Help/manual/ccmake.1.rst index a5fe191..bed230c 100644 --- a/Help/manual/ccmake.1.rst +++ b/Help/manual/ccmake.1.rst @@ -1,6 +1,6 @@ .. cmake-manual-description: CMake Curses Dialog Command-Line Reference -ccmake(1) +ccmake3(1) ********* Synopsis @@ -8,12 +8,12 @@ .. parsed-literal:: - ccmake [] { | } + ccmake3 [] { | } Description =========== -The "ccmake" executable is the CMake curses interface. Project +The "ccmake3" executable is the CMake curses interface. Project configuration settings may be specified interactively through this GUI. Brief instructions are provided at the bottom of the terminal when the program is running. diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 07bf33f..e15b29a 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Buildsystem Reference -cmake-buildsystem(7) -******************** +cmake3-buildsystem(7) +********************* .. only:: html @@ -167,7 +167,7 @@ the properties must be **requirements**, not merely recommendations or convenience. See the :ref:`Creating Relocatable Packages` section of the -:manual:`cmake-packages(7)` manual for discussion of additional care +:manual:`cmake3-packages(7)` manual for discussion of additional care that must be taken when specifying usage requirements while creating packages for redistribution. @@ -332,7 +332,7 @@ consumers must be compiled as position-independent-code. Here, both ``exe1`` and ``exe2`` will be compiled as position-independent-code. ``lib1`` will also be compiled as position-independent-code because that is the default setting for ``SHARED`` libraries. If dependencies have conflicting, -non-compatible requirements :manual:`cmake(1)` issues a diagnostic: +non-compatible requirements :manual:`cmake3(1)` issues a diagnostic: .. code-block:: cmake @@ -453,7 +453,7 @@ Property Origin Debugging Because build specifications can be determined by dependencies, the lack of locality of code which creates a target and code which is responsible for setting build specifications may make the code more difficult to reason about. -:manual:`cmake(1)` provides a debugging facility to print the origin of the +:manual:`cmake3(1)` provides a debugging facility to print the origin of the contents of properties which may be determined by dependencies. The properties which can be debugged are listed in the :variable:`CMAKE_DEBUG_TARGET_PROPERTIES` variable documentation: @@ -482,7 +482,7 @@ Build Specification with Generator Expressions ---------------------------------------------- Build specifications may use -:manual:`generator expressions ` containing +:manual:`generator expressions ` containing content which may be conditional or known only at generate-time. For example, the calculated "compatible" value of a property may be read with the ``TARGET_PROPERTY`` expression: @@ -519,7 +519,7 @@ being built. In the presence of :prop_tgt:`IMPORTED` targets, the content of :prop_tgt:`MAP_IMPORTED_CONFIG_DEBUG >` is also accounted for by this expression. -Some buildsystems generated by :manual:`cmake(1)` have a predetermined +Some buildsystems generated by :manual:`cmake3(1)` have a predetermined build-configuration set in the :variable:`CMAKE_BUILD_TYPE` variable. The buildsystem for the IDEs such as Visual Studio and Xcode are generated independent of the build-configuration, and the actual build configuration @@ -603,7 +603,7 @@ Depending on whether the ``ClimbingStats`` package was used from the build location or the install location, the ``Downstream`` target would be compiled with either ``-DClimbingStats_FROM_BUILD_LOCATION`` or ``-DClimbingStats_FROM_INSTALL_LOCATION``. For more about packages and -exporting see the :manual:`cmake-packages(7)` manual. +exporting see the :manual:`cmake3-packages(7)` manual. .. _`Include Directories and Usage Requirements`: @@ -716,7 +716,7 @@ As the value of the :prop_tgt:`POSITION_INDEPENDENT_CODE` property of the ``exe1`` target is dependent on the linked libraries (``lib3``), and the edge of linking ``exe1`` is determined by the same :prop_tgt:`POSITION_INDEPENDENT_CODE` property, the dependency graph above -contains a cycle. :manual:`cmake(1)` issues a diagnostic in this case. +contains a cycle. :manual:`cmake3(1)` issues a diagnostic in this case. .. _`Output Artifacts`: @@ -852,7 +852,7 @@ the scope of a cmake variable. It is also possible to define a ``GLOBAL`` :prop_tgt:`IMPORTED` target which is accessible globally in the buildsystem. -See the :manual:`cmake-packages(7)` manual for more on creating packages +See the :manual:`cmake3-packages(7)` manual for more on creating packages with :prop_tgt:`IMPORTED` targets. .. _`Alias Targets`: diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst index d0c2986..78bf39c 100644 --- a/Help/manual/cmake-commands.7.rst +++ b/Help/manual/cmake-commands.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Language Command Reference -cmake-commands(7) -***************** +cmake3-commands(7) +****************** .. only:: html diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 7289e61..77704f1 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Compile Features Reference -cmake-compile-features(7) -************************* +cmake3-compile-features(7) +************************** .. only:: html @@ -46,7 +46,7 @@ be compiled with compiler support for the target_compile_features(mylib PRIVATE cxx_constexpr) In processing the requirement for the ``cxx_constexpr`` feature, -:manual:`cmake(1)` will ensure that the in-use C++ compiler is capable +:manual:`cmake3(1)` will ensure that the in-use C++ compiler is capable of the feature, and will add any necessary flags such as ``-std=gnu++11`` to the compile lines of C++ files in the ``mylib`` target. A ``FATAL_ERROR`` is issued if the compiler is not capable of the @@ -81,7 +81,7 @@ target_link_libraries(myexe mylib) Feature requirements are evaluated transitively by consuming the link -implementation. See :manual:`cmake-buildsystem(7)` for more on +implementation. See :manual:`cmake3-buildsystem(7)` for more on transitive behavior of build properties and usage requirements. Requiring Language Standards @@ -267,10 +267,10 @@ abstract. What is needed is to use alternative include directories depending on the compiler capabilities. CMake provides a ``COMPILE_FEATURES`` -:manual:`generator expression ` to implement +:manual:`generator expression ` to implement such conditions. This may be used with the build-property commands such as :command:`target_include_directories` and :command:`target_link_libraries` -to set the appropriate :manual:`buildsystem ` +to set the appropriate :manual:`buildsystem ` properties: .. code-block:: cmake diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 7bfdcad..f5ff0fd 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Developer Reference -cmake-developer(7) -****************** +cmake3-developer(7) +******************* .. only:: html @@ -202,29 +202,29 @@ documentation: ``generator`` A CMake native build system generator. - See the :manual:`cmake(1)` command-line tool's ``-G`` option. + See the :manual:`cmake3(1)` command-line tool's ``-G`` option. ``manual`` - A CMake manual page, like this :manual:`cmake-developer(7)` manual. + A CMake manual page, like this :manual:`cmake3-developer(7)` manual. ``module`` A CMake module. - See the :manual:`cmake-modules(7)` manual + See the :manual:`cmake3-modules(7)` manual and the :command:`include` command. ``policy`` A CMake policy. - See the :manual:`cmake-policies(7)` manual + See the :manual:`cmake3-policies(7)` manual and the :command:`cmake_policy` 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)` + or target property, respectively. See the :manual:`cmake3-properties(7)` manual and the :command:`set_property` command. ``variable`` A CMake language variable. - See the :manual:`cmake-variables(7)` manual + See the :manual:`cmake3-variables(7)` manual and the :command:`set` command. Documentation objects in the CMake Domain come from two sources. @@ -567,7 +567,7 @@ endmacro() Test the documentation formatting by running -``cmake --help-module ``, and also by enabling the +``cmake3 --help-module ``, and also by enabling the ``SPHINX_HTML`` and ``SPHINX_MAN`` options to build the documentation. Edit the comments until generated documentation looks satisfactory. To have a .cmake file in this directory NOT show up in the modules @@ -948,7 +948,7 @@ so that the variant is chosen if the user uses a configuration which is not an exact match for any listed ``IMPORTED_CONFIGURATIONS``. -Most of the cache variables should be hidden in the ``ccmake`` interface unless +Most of the cache variables should be hidden in the ``ccmake3`` interface unless the user explicitly asks to edit them. .. code-block:: cmake diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index d4f47dd..6dac1cf 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Generator Expressions -cmake-generator-expressions(7) -****************************** +cmake3-generator-expressions(7) +******************************* .. only:: html @@ -87,7 +87,7 @@ Available logical expressions are: the link implementation of a target and if any dependency transitively increases the required :prop_tgt:`C_STANDARD` or :prop_tgt:`CXX_STANDARD` for the 'head' target, an error is reported. See the - :manual:`cmake-compile-features(7)` manual for information on + :manual:`cmake3-compile-features(7)` manual for information on compile features and a list of supported compilers. ``$`` ``1`` when the language used for compilation unit matches ``lang``, diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index cde8de8..0b01e9e 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Generators Reference -cmake-generators(7) -******************* +cmake3-generators(7) +******************** .. only:: html @@ -18,10 +18,10 @@ as a variant of some of the `Command-Line Build Tool Generators`_ to produce project files for an auxiliary IDE. CMake Generators are platform-specific so each may be available only -on certain platforms. The :manual:`cmake(1)` command-line tool ``--help`` +on certain platforms. The :manual:`cmake3(1)` command-line tool ``--help`` output lists available generators on the current platform. Use its ``-G`` option to specify the generator for a new build tree. -The :manual:`cmake-gui(1)` offers interactive selection of a generator +The :manual:`cmake3-gui(1)` offers interactive selection of a generator when creating a new build tree. CMake Generators @@ -95,7 +95,7 @@ Other Generators Extra Generators ================ -Some of the `CMake Generators`_ listed in the :manual:`cmake(1)` +Some of the `CMake Generators`_ listed in the :manual:`cmake3(1)` command-line tool ``--help`` output may have variants that specify an extra generator for an auxiliary IDE tool. Such generator names have the form `` - ``. diff --git a/Help/manual/cmake-gui.1.rst b/Help/manual/cmake-gui.1.rst index 032b51f..a8a3ef0 100644 --- a/Help/manual/cmake-gui.1.rst +++ b/Help/manual/cmake-gui.1.rst @@ -1,6 +1,6 @@ .. cmake-manual-description: CMake GUI Command-Line Reference -cmake-gui(1) +cmake3-gui(1) ************ Synopsis @@ -8,13 +8,13 @@ .. parsed-literal:: - cmake-gui [] - cmake-gui [] { | } + cmake3-gui [] + cmake3-gui [] { | } Description =========== -The "cmake-gui" executable is the CMake GUI. Project configuration +The "cmake3-gui" executable is the CMake GUI. Project configuration settings may be specified interactively. Brief instructions are provided at the bottom of the window when the program is running. diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst index 41542c9..6240b1e 100644 --- a/Help/manual/cmake-language.7.rst +++ b/Help/manual/cmake-language.7.rst @@ -1,7 +1,7 @@ .. cmake-manual-description: CMake Language Reference -cmake-language(7) -***************** +cmake3-language(7) +****************** .. only:: html @@ -36,7 +36,7 @@ Scripts ------- An individual ``