diff options
Diffstat (limited to 'Help')
-rw-r--r-- | Help/manual/cmake-variables.7.rst | 4 | ||||
-rw-r--r-- | Help/release/dev/compiler_archiving_tools.rst | 8 | ||||
-rw-r--r-- | Help/release/dev/gcc_archiving_tools.rst | 8 | ||||
-rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_AR.rst (renamed from Help/variable/CMAKE_GCC_AR.rst) | 6 | ||||
-rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_RANLIB.rst (renamed from Help/variable/CMAKE_GCC_RANLIB.rst) | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 9d8d596..c45574f 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -40,8 +40,6 @@ Variables that Provide Information /variable/CMAKE_FIND_PACKAGE_NAME /variable/CMAKE_FIND_PACKAGE_SORT_DIRECTION /variable/CMAKE_FIND_PACKAGE_SORT_ORDER - /variable/CMAKE_GCC_AR - /variable/CMAKE_GCC_RANLIB /variable/CMAKE_GENERATOR /variable/CMAKE_GENERATOR_PLATFORM /variable/CMAKE_GENERATOR_TOOLSET @@ -50,6 +48,8 @@ Variables that Provide Information /variable/CMAKE_IMPORT_LIBRARY_SUFFIX /variable/CMAKE_JOB_POOL_COMPILE /variable/CMAKE_JOB_POOL_LINK + /variable/CMAKE_LANG_COMPILER_AR + /variable/CMAKE_LANG_COMPILER_RANLIB /variable/CMAKE_LINK_LIBRARY_SUFFIX /variable/CMAKE_LINK_SEARCH_END_STATIC /variable/CMAKE_LINK_SEARCH_START_STATIC diff --git a/Help/release/dev/compiler_archiving_tools.rst b/Help/release/dev/compiler_archiving_tools.rst new file mode 100644 index 0000000..de3471d --- /dev/null +++ b/Help/release/dev/compiler_archiving_tools.rst @@ -0,0 +1,8 @@ +compiler_archiving_tools +------------------------ + +* A :variable:`CMAKE_<LANG>_COMPILER_AR` variable was added to hold + the path to the GCC/Clang wrapper of ``ar``. + +* A :variable:`CMAKE_<LANG>_COMPILER_RANLIB` variable was added to hold + the path to the GCC/Clang wrapper of ``ranlib``. diff --git a/Help/release/dev/gcc_archiving_tools.rst b/Help/release/dev/gcc_archiving_tools.rst deleted file mode 100644 index b3cc7d6..0000000 --- a/Help/release/dev/gcc_archiving_tools.rst +++ /dev/null @@ -1,8 +0,0 @@ -gcc_archiving_tools -------------------- - -* The :variable:`CMAKE_GCC_AR` variable with the path to GCC wrapper of ``ar`` - utility was added. - -* The :variable:`CMAKE_GCC_RANLIB` variable with the path to GCC wrapper of - ``ranlib`` utility was added. diff --git a/Help/variable/CMAKE_GCC_AR.rst b/Help/variable/CMAKE_LANG_COMPILER_AR.rst index ac90b46..b83a1d4 100644 --- a/Help/variable/CMAKE_GCC_AR.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_AR.rst @@ -1,7 +1,7 @@ -CMAKE_GCC_AR ------------- +CMAKE_<LANG>_COMPILER_AR +------------------------ A wrapper around ``ar`` adding the appropriate ``--plugin`` option for the -GCC compiler. For other compilers variable is not defined. +compiler. See also :variable:`CMAKE_AR`. diff --git a/Help/variable/CMAKE_GCC_RANLIB.rst b/Help/variable/CMAKE_LANG_COMPILER_RANLIB.rst index 3d42aba..945160b 100644 --- a/Help/variable/CMAKE_GCC_RANLIB.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_RANLIB.rst @@ -1,7 +1,7 @@ -CMAKE_GCC_RANLIB ----------------- +CMAKE_<LANG>_COMPILER_RANLIB +---------------------------- A wrapper around ``ranlib`` adding the appropriate ``--plugin`` option for the -GCC compiler. For other compilers variable is not defined. +compiler. See also :variable:`CMAKE_RANLIB`. |