From 0ad87ad8ce2cf17366bea77facaee247d0f3a6ad Mon Sep 17 00:00:00 2001 From: basebuilder_pel7ppc64lebuilder0 Date: Wed, 24 May 2023 02:31:09 +0200 Subject: [PATCH] cmake3 update to 3.17.5 Signed-off-by: basebuilder_pel7ppc64lebuilder0 --- SOURCES/CMake3.appdata.xml | 19 + SOURCES/cmake3-findruby.patch | 28 +- SOURCES/cmake3-rename.patch | 2306 +++++++++++++++------------------ SOURCES/cmake3.prov | 13 +- SPECS/cmake3.spec | 259 ++-- 5 files changed, 1207 insertions(+), 1418 deletions(-) create mode 100644 SOURCES/CMake3.appdata.xml diff --git a/SOURCES/CMake3.appdata.xml b/SOURCES/CMake3.appdata.xml new file mode 100644 index 00000000..f37b539c --- /dev/null +++ b/SOURCES/CMake3.appdata.xml @@ -0,0 +1,19 @@ + + + CMake3.desktop + CC0-1.0 + CMake GUI + Create new CMake projects + +

+ CMake is an open source, cross platform build system that can build, test, + and package software. CMake GUI is a graphical user interface that can + create and edit CMake projects. +

+ + http://www.cmake.org + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/CMake/a.png + + cmake3-owner_at_fedoraproject.org + diff --git a/SOURCES/cmake3-findruby.patch b/SOURCES/cmake3-findruby.patch index 509197d0..6ef74bfe 100644 --- a/SOURCES/cmake3-findruby.patch +++ b/SOURCES/cmake3-findruby.patch @@ -1,19 +1,19 @@ --- a/Modules/FindRuby.cmake.orig 2014-10-27 08:40:56.000000000 -0600 +++ b/Modules/FindRuby.cmake 2014-10-29 20:37:15.832502515 -0600 -@@ -109,14 +109,8 @@ - _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) - _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) +@@ -110,14 +110,8 @@ + _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) + _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) -- # vendor_ruby available ? -- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" -- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) +- # vendor_ruby available ? +- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" +- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) - -- if(RUBY_HAS_VENDOR_RUBY) -- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) -- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) -- endif() -+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) -+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) +- if(RUBY_HAS_VENDOR_RUBY) +- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) +- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) +- endif() ++ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) - # save the results in the cache so we don't have to run ruby the next time again - set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) + # save the results in the cache so we don't have to run ruby the next time again + set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) diff --git a/SOURCES/cmake3-rename.patch b/SOURCES/cmake3-rename.patch index b10d417d..6f44f9f5 100644 --- a/SOURCES/cmake3-rename.patch +++ b/SOURCES/cmake3-rename.patch @@ -1,7 +1,9 @@ -commit 358969d05331b70df02521bf2aad42e841085d2c Author: Björn Esser Date: Tue Aug 23 13:35:29 2016 +0200 +Modified by sagitter +Date Sun Apr 26 2020 + cmake3-rename.patch diff --git a/Auxiliary/CMakeLists.txt b/Auxiliary/CMakeLists.txt @@ -19,6 +21,19 @@ index c003b28..f1e9f42 100644 +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) +--- a/Auxiliary/cmake-mode.orig.el 2019-07-16 13:19:54.000000000 +0200 ++++ b/Auxiliary/cmake-mode.el 2019-08-30 12:46:28.956582109 +0200 +@@ -12,8 +12,8 @@ + ;; + ;; Add this code to your .emacs file to use the mode: + ;; +-;; (setq load-path (cons (expand-file-name "/dir/with/cmake-mode") load-path)) +-;; (require 'cmake-mode) ++;; (setq load-path (cons (expand-file-name "./cmake3-mode") load-path)) ++;; (require 'cmake3-mode) + + ;------------------------------------------------------------------------------ + diff --git a/Auxiliary/bash-completion/CMakeLists.txt b/Auxiliary/bash-completion/CMakeLists.txt index c0a8899..bb7ce47 100644 --- a/Auxiliary/bash-completion/CMakeLists.txt @@ -54,15 +69,7 @@ index 6061129..5e6277e 100644 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 +@@ -83,7 +83,7 @@ return ;; -U) @@ -80,7 +87,7 @@ index 6061129..5e6277e 100644 '/^ [^ ]/{s|^ \([^ ]\{1,\}\) .*$|\1|;p}' 2>/dev/null )" \ -- "$cur" ) ) return -@@ -110,40 +110,40 @@ _cmake() +@@ -110,7 +110,7 @@ local IFS=$'\n' local quoted printf -v quoted %q "$cur" @@ -89,7 +96,8 @@ index 6061129..5e6277e 100644 -e "1,/^Generators/d" \ -e "/^ *[^ =]/{s|^ *\([^=]*[^ =]\).*$|\1|;s| |\\\\ |g;p}" \ 2>/dev/null )' -- "$quoted" ) ) - return +@@ -120,33 +120,33 @@ + COMPREPLY=( $(compgen -W 'error warning notice status verbose debug trace' -- $cur ) ) ;; --help-command) - COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| @@ -134,7 +142,7 @@ index 6061129..5e6277e 100644 return ;; esac -@@ -158,6 +158,6 @@ _cmake() +@@ -161,6 +161,6 @@ _filedir } && @@ -264,6 +272,17 @@ index 49343bb..69affe4 100644 +complete -F _ctest3 ctest3 # ex: ts=4 sw=4 et filetype=sh +--- a/Auxiliary/cmake.orig.m4 2019-07-16 13:19:54.000000000 +0200 ++++ b/Auxiliary/cmake.m4 2019-08-30 11:44:52.162852622 +0200 +@@ -5,7 +5,7 @@ + [AC_ARG_VAR([CMAKE_BINARY], [path to the cmake binary])dnl + + if test "x$ac_cv_env_CMAKE_BINARY_set" != "xset"; then +- AC_PATH_TOOL([CMAKE_BINARY], [cmake])dnl ++ AC_PATH_TOOL([CMAKE_BINARY], [cmake3])dnl + fi + ])dnl + diff --git a/CMakeLists.txt b/CMakeLists.txt index 787f319..3ef8605 100644 --- a/CMakeLists.txt @@ -292,45 +311,41 @@ index 787f319..3ef8605 100644 endif() endif() +--- a/Help/command/add_compile_definitions.orig.rst 2019-07-16 13:19:54.000000000 +0200 ++++ b/Help/command/add_compile_definitions.rst 2019-08-28 20:32:45.880021119 +0200 +@@ -20,4 +20,4 @@ + Arguments to ``add_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)` ++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/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`). - +@@ -17,4 +17,4 @@ 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. +@@ -97,7 +97,7 @@ + command name is a program to be found on the ``PATH`` at build time. 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. + Use the ``TARGET_FILE`` generator expression to refer to the location of + a target later in the command line (i.e. as a command argument rather + than as the command to execute). +@@ -153,12 +153,12 @@ + create the ``OUTPUT``, the rule will always run. Arguments to ``DEPENDS`` may use - :manual:`generator expressions `. @@ -338,19 +353,49 @@ index d421364..34d3a12 100644 ``COMMAND_EXPAND_LISTS`` Lists in ``COMMAND`` arguments will be expanded, including those + created with +- :manual:`generator expressions `, ++ :manual:`generator expressions `, + allowing ``COMMAND`` arguments such as + ``${CC} "-I$,;-I>" foo.cc`` + to be properly expanded. +@@ -222,7 +222,7 @@ + build tree directory corresponding to the current source directory. + + Arguments to ``WORKING_DIRECTORY`` may use +- :manual:`generator expressions `. ++ :manual:`generator expressions `. + + ``DEPFILE`` + Specify a ``.d`` depfile for the :generator:`Ninja` generator. 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. +@@ -76,7 +76,7 @@ + command name is a program to be found on the ``PATH`` at build time. Arguments to ``COMMAND`` may use - :manual:`generator expressions `. + :manual:`generator expressions `. - References to target names in generator expressions imply target-level - dependencies. - + Use the ``TARGET_FILE`` generator expression to refer to the location of + a target later in the command line (i.e. as a command argument rather + than as the command to execute). +@@ -108,7 +108,7 @@ + ``COMMAND_EXPAND_LISTS`` + Lists in ``COMMAND`` arguments will be expanded, including those + created with +- :manual:`generator expressions `, ++ :manual:`generator expressions `, + allowing ``COMMAND`` arguments such as + ``${CC} "-I$,;-I>" foo.cc`` + to be properly expanded. +@@ -146,4 +146,4 @@ + build tree directory corresponding to the current source directory. + + Arguments to ``WORKING_DIRECTORY`` may use +- :manual:`generator expressions `. ++ :manual:`generator expressions `. diff --git a/Help/command/add_definitions.rst b/Help/command/add_definitions.rst index a04faf5..4e0cb02 100644 --- a/Help/command/add_definitions.rst @@ -403,38 +448,47 @@ index d8a96e9..9329d3f 100644 -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)`. - :: + .. code-block:: cmake -@@ -31,13 +31,13 @@ quotes, or other characters special in CMake syntax. The options are: +@@ -37,14 +37,14 @@ 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. + unless the :prop_test:`PASS_REGULAR_EXPRESSION`, + :prop_test:`FAIL_REGULAR_EXPRESSION` or + :prop_test:`SKIP_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:: + Example usage: +--- a/Help/command/add_link_options.orig.rst 2019-07-16 13:19:54.000000000 +0200 ++++ b/Help/command/add_link_options.rst 2019-08-28 20:30:01.160177427 +0200 +@@ -19,4 +19,4 @@ + Arguments to ``add_link_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. 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:: +@@ -16,7 +16,7 @@ - --build . [--config ] [--target ] [-- -i] + --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 @@ -475,7 +529,7 @@ 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: +@@ -93,7 +93,7 @@ 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, @@ -483,7 +537,7 @@ index 412e323..e2d0425 100644 + 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 `` + ``REPEAT :`` diff --git a/Help/command/file.rst b/Help/command/file.rst index 256d16d..fd51aca 100644 --- a/Help/command/file.rst @@ -503,19 +557,19 @@ 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``. +@@ -339,7 +339,7 @@ + to ``FALSE`` or the deprecated variable + :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 +@@ -357,7 +357,7 @@ + variable to ``FALSE`` or the deprecated variable :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. @@ -525,20 +579,20 @@ diff --git a/Help/command/get_cmake_property.rst b/Help/command/get_cmake_proper 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. +@@ -10,7 +10,7 @@ + Gets a global property from the CMake instance. The value of + the ```` is stored in the variable ````. + If the property is not found, ```` will be set to ``NOTFOUND``. +-See the :manual:`cmake-properties(7)` manual for available properties. ++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 +@@ -30,8 +30,8 @@ considered in dependency calculations - see compiler docs. Arguments to ``include_directories`` may use "generator expressions" with @@ -547,60 +601,63 @@ index f694934..a73d296 100644 +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. + + .. note:: 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 +@@ -345,3 +345,3 @@ 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 +@@ -376,3 +376,3 @@ "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 +@@ -433,3 +433,3 @@ 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" +@@ -556,3 +556,3 @@ + given as a ``DESTINATION`` argument 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. +@@ -586,3 +586,3 @@ + name, not the file's contents). See the +-:manual:`cmake-generator-expressions(7)` manual for available expressions. ++:manual:`cmake3-generator-expressions(7)` manual for available expressions. - Custom Installation Logic +--- a/Help/command/link_directories.orig.rst 2019-08-28 20:47:01.038018040 +0200 ++++ b/Help/command/link_directories.rst 2019-08-28 20:46:27.679252213 +0200 +@@ -25,4 +25,4 @@ + Arguments to ``link_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. +--- a/Help/command/list.orig.rst 2019-07-16 13:19:54.000000000 +0200 ++++ b/Help/command/list.rst 2019-08-28 20:45:09.237802860 +0200 +@@ -213,3 +213,3 @@ + ``GENEX_STRIP``: Strip any +-:manual:`generator expressions ` from each ++:manual:`generator expressions ` from each + element of the list. 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 - --- - +@@ -4,3 +4,3 @@ 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: - +@@ -46,12 +46,12 @@ ``BOOL`` - Boolean ``ON/OFF`` value. :manual:`cmake-gui(1)` offers a checkbox. + Boolean ``ON/OFF`` value. :manual:`cmake3-gui(1)` offers a checkbox. @@ -617,29 +674,26 @@ index d04b880..3ca46a6 100644 - 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. - +@@ -60,3 +60,3 @@ ``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``. - +@@ -65,3 +65,3 @@ 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. - +@@ -75,3 +75,3 @@ 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`` +@@ -90,3 +90,3 @@ + +-Sets an :manual:`Environment Variable ` ++Sets an :manual:`Environment Variable ` + to the given value. diff --git a/Help/command/set_property.rst b/Help/command/set_property.rst index 5ed788e..ab8f0be 100644 --- a/Help/command/set_property.rst @@ -655,27 +709,26 @@ diff --git a/Help/command/set_tests_properties.rst b/Help/command/set_tests_prop 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 +@@ -11,3 +11,3 @@ 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. + expanded the same as supported by the test's :command:`add_test` call. 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.rst.rename 2020-04-25 21:17:46.765645996 +0200 ++++ string.rst 2020-04-25 21:36:35.243891919 +0200 +@@ -280,7 +280,7 @@ - string(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``. + from the input ```` and store the result in the ````. - Comparison + .. _REPEAT: 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 @@ -718,7 +771,7 @@ index 73e01e7..542c589 100644 +manual for available expressions. See the :manual:`cmake3-buildsystem(7)` manual for more on defining buildsystem properties. - .. include:: COMPILE_OPTIONS_SHELL.txt + .. include:: 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 @@ -734,26 +787,43 @@ index 30ec2cb..80e9885 100644 manual for more on defining buildsystem properties. Include directories usage requirements commonly differ between the build-tree +--- a/Help/command/target_link_directories.orig.rst 2019-07-16 13:19:54.000000000 +0200 ++++ b/Help/command/target_link_directories.rst 2019-08-28 20:43:30.726494395 +0200 +@@ -34,4 +34,4 @@ + Arguments to ``target_link_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. 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. +@@ -95,3 +95,3 @@ + * **A generator expression**: A ``$<...>`` :manual:`generator expression +- ` may evaluate to any of the above ++ ` may evaluate to any of the above + items or to a :ref:`semicolon-separated list ` of them. +@@ -126,3 +126,3 @@ - Libraries for a Target and/or its Dependents +-See the :manual:`cmake-buildsystem(7)` manual for more on defining ++See the :manual:`cmake3-buildsystem(7)` manual for more on defining + buildsystem properties. +--- a/Help/command/target_link_options.orig.rst 2019-07-16 13:19:54.000000000 +0200 ++++ b/Help/command/target_link_options.rst 2019-08-28 23:47:40.923492253 +0200 +@@ -35,4 +35,4 @@ + Arguments to ``target_link_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. 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 +@@ -26,8 +26,8 @@ ```` append items in the order called. Arguments to ``target_sources`` may use "generator expressions" @@ -762,6 +832,8 @@ index d6f148d..4ebbac8 100644 +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. + + See also the :policy:`CMP0076` policy for older behavior related to the diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index 7830deb..50693bb 100644 --- a/Help/command/try_compile.rst @@ -797,33 +869,34 @@ index e3bd57d..995d84e 100644 The example in :command:`try_compile` shows how values for variables ``INCLUDE_DIRECTORIES``, ``LINK_DIRECTORIES``, and ``LINK_LIBRARIES`` are used. +--- a/Help/command/unset.orig.rst 2019-08-28 20:39:18.588264367 +0200 ++++ b/Help/command/unset.rst 2019-08-28 20:38:43.919507736 +0200 +@@ -35,3 +35,3 @@ + Removes ```` from the currently available +-:manual:`Environment Variables `. ++:manual:`Environment Variables `. + Subsequent calls of ``$ENV{}`` will return the empty string. 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 +@@ -2,4 +2,4 @@ -ccmake(1) +-********* +ccmake3(1) - ********* - - Synopsis -@@ -8,12 +8,12 @@ ++********** - .. parsed-literal:: +@@ -10,3 +10,3 @@ - ccmake [] { | } + ccmake3 [] { | } - Description - =========== +@@ -15,3 +15,3 @@ --The "ccmake" executable is the CMake curses interface. Project -+The "ccmake3" executable is the CMake curses interface. Project +-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 @@ -973,93 +1046,39 @@ diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.r 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 +@@ -2,4 +2,4 @@ -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``. +@@ -13,3 +13,3 @@ + This manual is intended for reference by developers working with +-:manual:`cmake-language(7)` code, whether writing their own modules, ++:manual:`cmake3-language(7)` code, whether writing their own modules, + authoring their own build systems, or working on CMake itself. +@@ -416,3 +416,3 @@ -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 +@@ -2,4 +2,4 @@ -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` +@@ -149,3 +149,3 @@ 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 @@ -1100,86 +1119,69 @@ 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 +@@ -2,4 +2,4 @@ -cmake-gui(1) +-************ +cmake3-gui(1) - ************ ++************* - Synopsis -@@ -8,13 +8,13 @@ - - .. parsed-literal:: +@@ -10,5 +10,5 @@ - cmake-gui [] - cmake-gui [] { | } +- cmake-gui [] -S -B + cmake3-gui [] + cmake3-gui [] { | } ++ cmake3-gui [] -S -B - Description - =========== +@@ -17,3 +17,3 @@ --The "cmake-gui" executable is the CMake GUI. Project configuration -+The "cmake3-gui" executable is the CMake GUI. Project configuration +-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 +@@ -2,4 +2,4 @@ -cmake-language(7) -***************** +cmake3-language(7) +****************** - .. only:: html - -@@ -36,7 +36,7 @@ Scripts - ------- - +@@ -38,3 +38,3 @@ An individual ``