[Cmake-commits] CMake branch, master, updated. v3.13.0-rc3-411-g518b0cf
Kitware Robot
kwrobot at kitware.com
Mon Nov 12 16:43:03 EST 2018
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, master has been updated
via 518b0cf3b63956b577c984a3c8735d2d75d174d3 (commit)
via 68c86a20cea84f3de7721415a6cde8653e0994fd (commit)
via a39d6f6bc3ac8a99969c8627cc9ce18a095366aa (commit)
via 96c31fad71cab6bd45c094bbde7c4fded5805eef (commit)
via f05d7ed5ffb00b4d146172e2fd29a988a534d99e (commit)
via 89b5f4fcc7b8d3942fd92409ac57ddc3e7328560 (commit)
from f3702546521cbc09f1180365e9389a0eef87831b (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=518b0cf3b63956b577c984a3c8735d2d75d174d3
commit 518b0cf3b63956b577c984a3c8735d2d75d174d3
Merge: 68c86a2 96c31fa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:33:53 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:36:01 2018 -0500
Merge topic 'BundleUtilities'
96c31fad71 Help: Downcase functions in BundleUtilities
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2599
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68c86a20cea84f3de7721415a6cde8653e0994fd
commit 68c86a20cea84f3de7721415a6cde8653e0994fd
Merge: a39d6f6 89b5f4f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:33:09 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:34:24 2018 -0500
Merge topic 'FindPackageMessage'
89b5f4fcc7 Help: Correct macro -> function in FindPackageMessage.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2598
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a39d6f6bc3ac8a99969c8627cc9ce18a095366aa
commit a39d6f6bc3ac8a99969c8627cc9ce18a095366aa
Merge: f370254 f05d7ed
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 12 21:32:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Nov 12 16:33:10 2018 -0500
Merge topic 'CheckPrototypeDefinition'
f05d7ed5ff Help: correct macro -> function in CheckPrototypeDefinition
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2591
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96c31fad71cab6bd45c094bbde7c4fded5805eef
commit 96c31fad71cab6bd45c094bbde7c4fded5805eef
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 15:49:31 2018 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 15:49:31 2018 +0100
Help: Downcase functions in BundleUtilities
Presumably, capitalization was left over from very old times
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 4a3f476..10e5510 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -41,7 +41,7 @@ Instead, invoke them from an :command:`install(CODE)` or
.. code-block:: cmake
- FIXUP_BUNDLE(<app> <libs> <dirs>)
+ fixup_bundle(<app> <libs> <dirs>)
Fix up a bundle in-place and make it standalone, such that it can be
drag-n-drop copied to another machine and run on that machine as long
@@ -64,14 +64,14 @@ which are then ignored (e.g. IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe")
.. code-block:: cmake
- COPY_AND_FIXUP_BUNDLE(<src> <dst> <libs> <dirs>)
+ copy_and_fixup_bundle(<src> <dst> <libs> <dirs>)
Makes a copy of the bundle <src> at location <dst> and then fixes up
the new copied bundle in-place at <dst>...
.. code-block:: cmake
- VERIFY_APP(<app>)
+ verify_app(<app>)
Verifies that an application <app> appears valid based on running
analysis tools on it. Calls "message(FATAL_ERROR" if the application
@@ -82,14 +82,14 @@ which are then ignored (e.g. IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe")
.. code-block:: cmake
- GET_BUNDLE_MAIN_EXECUTABLE(<bundle> <result_var>)
+ get_bundle_main_executable(<bundle> <result_var>)
The result will be the full path name of the bundle's main executable
file or an "error:" prefixed string if it could not be determined.
.. code-block:: cmake
- GET_DOTAPP_DIR(<exe> <dotapp_dir_var>)
+ get_dotapp_dir(<exe> <dotapp_dir_var>)
Returns the nearest parent dir whose name ends with ".app" given the
full path to an executable. If there is no such parent dir, then
@@ -99,7 +99,7 @@ The returned directory may or may not exist.
.. code-block:: cmake
- GET_BUNDLE_AND_EXECUTABLE(<app> <bundle_var> <executable_var> <valid_var>)
+ get_bundle_and_executable(<app> <bundle_var> <executable_var> <valid_var>)
Takes either a ".app" directory name or the name of an executable
nested inside a ".app" directory and returns the path to the ".app"
@@ -108,14 +108,14 @@ directory in <bundle_var> and the path to its main executable in
.. code-block:: cmake
- GET_BUNDLE_ALL_EXECUTABLES(<bundle> <exes_var>)
+ get_bundle_all_executables(<bundle> <exes_var>)
Scans the given bundle recursively for all executable files and
accumulates them into a variable.
.. code-block:: cmake
- GET_ITEM_KEY(<item> <key_var>)
+ get_item_key(<item> <key_var>)
Given a file (item) name, generate a key that should be unique
considering the set of libraries that need copying or fixing up to
@@ -127,7 +127,7 @@ associate a set of variables with a given item based on its key.
.. code-block:: cmake
- CLEAR_BUNDLE_KEYS(<keys_var>)
+ clear_bundle_keys(<keys_var>)
Loop over the list of keys, clearing all the variables associated with
each key. After the loop, clear the list of keys itself.
@@ -137,7 +137,7 @@ list of keys.
.. code-block:: cmake
- SET_BUNDLE_KEY_VALUES(<keys_var> <context> <item> <exepath> <dirs>
+ set_bundle_key_values(<keys_var> <context> <item> <exepath> <dirs>
<copyflag> [<rpaths>])
Add a key to the list (if necessary) for the given item. If added,
@@ -145,7 +145,7 @@ also set all the variables associated with that key.
.. code-block:: cmake
- GET_BUNDLE_KEYS(<app> <libs> <dirs> <keys_var>)
+ get_bundle_keys(<app> <libs> <dirs> <keys_var>)
Loop over all the executable and library files within the bundle (and
given as extra <libs>) and accumulate a list of keys representing
@@ -158,7 +158,7 @@ which are then ignored (e.g. IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe")
.. code-block:: cmake
- COPY_RESOLVED_ITEM_INTO_BUNDLE(<resolved_item> <resolved_embedded_item>)
+ copy_resolved_item_into_bundle(<resolved_item> <resolved_embedded_item>)
Copy a resolved item into the bundle if necessary. Copy is not
necessary if the resolved_item is "the same as" the
@@ -166,7 +166,7 @@ resolved_embedded_item.
.. code-block:: cmake
- COPY_RESOLVED_FRAMEWORK_INTO_BUNDLE(<resolved_item> <resolved_embedded_item>)
+ copy_resolved_framework_into_bundle(<resolved_item> <resolved_embedded_item>)
Copy a resolved framework into the bundle if necessary. Copy is not
necessary if the resolved_item is "the same as" the
@@ -180,7 +180,7 @@ dylib itself plus the framework Resources directory.
.. code-block:: cmake
- FIXUP_BUNDLE_ITEM(<resolved_embedded_item> <exepath> <dirs>)
+ fixup_bundle_item(<resolved_embedded_item> <exepath> <dirs>)
Get the direct/non-system prerequisites of the resolved embedded item.
For each prerequisite, change the way it is referenced to the value of
@@ -206,7 +206,7 @@ marked writable before install_name_tool tries to change them.
.. code-block:: cmake
- VERIFY_BUNDLE_PREREQUISITES(<bundle> <result_var> <info_var>)
+ verify_bundle_prerequisites(<bundle> <result_var> <info_var>)
Verifies that the sum of all prerequisites of all files inside the
bundle are contained within the bundle or are "system" libraries,
@@ -217,7 +217,7 @@ which are then ignored (e.g. IGNORE_ITEM "vcredist_x86.exe;vcredist_x64.exe")
.. code-block:: cmake
- VERIFY_BUNDLE_SYMLINKS(<bundle> <result_var> <info_var>)
+ verify_bundle_symlinks(<bundle> <result_var> <info_var>)
Verifies that any symlinks found in the bundle point to other files
that are already also in the bundle... Anything that points to an
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f05d7ed5ffb00b4d146172e2fd29a988a534d99e
commit f05d7ed5ffb00b4d146172e2fd29a988a534d99e
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 15:41:09 2018 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 15:41:09 2018 +0100
Help: correct macro -> function in CheckPrototypeDefinition
Correct in text, and downcase function name in function statement.
diff --git a/Modules/CheckPrototypeDefinition.cmake b/Modules/CheckPrototypeDefinition.cmake
index b379ec4..c90b766 100644
--- a/Modules/CheckPrototypeDefinition.cmake
+++ b/Modules/CheckPrototypeDefinition.cmake
@@ -28,7 +28,7 @@ Example:
"unistd.h;pwd.h"
SOLARIS_GETPWENT_R)
-The following variables may be set before calling this macro to modify
+The following variables may be set before calling this function to modify
the way the check is run:
::
@@ -46,7 +46,7 @@ get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
include_guard(GLOBAL)
-function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
+function(check_prototype_definition _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
if (NOT DEFINED ${_VARIABLE})
set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89b5f4fcc7b8d3942fd92409ac57ddc3e7328560
commit 89b5f4fcc7b8d3942fd92409ac57ddc3e7328560
Author: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Nov 12 14:35:44 2018 +0100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Mon Nov 12 15:34:41 2018 +0100
Help: Correct macro -> function in FindPackageMessage.
Correct in the text, and change capitalization accordingly.
diff --git a/Modules/FindPackageMessage.cmake b/Modules/FindPackageMessage.cmake
index 1cdfde8..0628b98 100644
--- a/Modules/FindPackageMessage.cmake
+++ b/Modules/FindPackageMessage.cmake
@@ -5,14 +5,14 @@
FindPackageMessage
------------------
+.. code-block:: cmake
+ find_package_message(<name> "message for user" "find result details")
-FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
-
-This macro is intended to be used in FindXXX.cmake modules files. It
-will print a message once for each unique find result. This is useful
-for telling the user where a package was found. The first argument
-specifies the name (XXX) of the package. The second argument
+This function is intended to be used in FindXXX.cmake modules files.
+It will print a message once for each unique find result. This is
+useful for telling the user where a package was found. The first
+argument specifies the name (XXX) of the package. The second argument
specifies the message to display. The third argument lists details
about the find result so that if they change the message will be
displayed again. The macro also obeys the QUIET argument to the
@@ -20,17 +20,17 @@ find_package command.
Example:
-::
+.. code-block:: cmake
if(X11_FOUND)
- FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
+ find_package_message(X11 "Found X11: ${X11_X11_LIB}"
"[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
else()
...
endif()
#]=======================================================================]
-function(FIND_PACKAGE_MESSAGE pkg msg details)
+function(find_package_message pkg msg details)
# Avoid printing a message repeatedly for the same find result.
if(NOT ${pkg}_FIND_QUIETLY)
string(REPLACE "\n" "" details "${details}")
-----------------------------------------------------------------------
Summary of changes:
Modules/BundleUtilities.cmake | 32 ++++++++++++++++----------------
Modules/CheckPrototypeDefinition.cmake | 4 ++--
Modules/FindPackageMessage.cmake | 18 +++++++++---------
3 files changed, 27 insertions(+), 27 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list