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 cecf7e61c4816e4a3bb55df243c6bf84f6df6e58 (commit)
via 8d59ebb7049f30f2c56f6d89b8e6c8db907c0324 (commit)
via e33f4cb0cb18a03aa12b308ba654ec5f305365f8 (commit)
via 6695383dd5a7855321dc011158e30ec24a7cf902 (commit)
via d5333c0923b80f211bd7be1ec3a2a935d70481e8 (commit)
from fe11593d3075c6bd7f425c55c7bfbb12b25f8b1f (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=cecf7e61c4816e4a3bb55df243c6bf84f6df6e58
commit cecf7e61c4816e4a3bb55df243c6bf84f6df6e58
Merge: fe11593 8d59ebb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 20 15:42:53 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jun 20 11:43:51 2019 -0400
Merge topic 'BundleUtilities-cleanup'
8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set
e33f4cb0cb BundleUtilities: use if(... IN_LIST ...)
6695383dd5 BundleUtilities: remove needless variable expansions in if()
arguments
d5333c0923 BundleUtilities: simplify inclusion of GetPrerequisites
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3447
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d59ebb7049f30f2c56f6d89b8e6c8db907c0324
commit 8d59ebb7049f30f2c56f6d89b8e6c8db907c0324
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jun 14 08:38:24 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Jun 19 07:14:31 2019 +0200
GetPrerequisites: use CMAKE_OBJDUMP if it is set
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 41d9dc1..2beea00 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -710,7 +710,9 @@ function(get_prerequisites target prerequisites_var
exclude_system recurse exepa
find_program(gp_dumpbin "dumpbin" PATHS ${gp_cmd_paths})
if(gp_dumpbin)
set(gp_tool "dumpbin")
- else() # Try harder. Maybe we're on MinGW
+ elseif(CMAKE_OBJDUMP) # Try harder. Maybe we're on MinGW
+ set(gp_tool "${CMAKE_OBJDUMP}")
+ else()
set(gp_tool "objdump")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e33f4cb0cb18a03aa12b308ba654ec5f305365f8
commit e33f4cb0cb18a03aa12b308ba654ec5f305365f8
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jun 14 08:33:27 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Jun 19 07:14:25 2019 +0200
BundleUtilities: use if(... IN_LIST ...)
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 182720b..2f3b9e1 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -243,6 +243,9 @@ if(DEFINED CMAKE_GENERATOR)
endif()
endif()
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
# The functions defined in this file depend on the get_prerequisites function
# (and possibly others) found in:
#
@@ -599,17 +602,9 @@ function(get_bundle_keys app libs dirs keys_var)
set_bundle_key_values(${keys_var} "${lib}" "${lib}" "${exepath}"
"${dirs}" 0 "${main_rpaths}")
set(prereqs "")
- set(ignoreFile FALSE)
get_filename_component(prereq_filename ${lib} NAME)
- if(NOT CFG_IGNORE_ITEM STREQUAL "")
- foreach(item ${CFG_IGNORE_ITEM})
- if(item STREQUAL prereq_filename)
- set(ignoreFile TRUE)
- endif()
- endforeach()
- endif()
- if(NOT ignoreFile)
+ if(NOT prereq_filename IN_LIST CFG_IGNORE_ITEM)
get_prerequisites("${lib}" prereqs 1 1 "${exepath}" "${dirs}"
"${main_rpaths}")
foreach(pr ${prereqs})
set_bundle_key_values(${keys_var} "${lib}" "${pr}" "${exepath}"
"${dirs}" 1 "${main_rpaths}")
@@ -642,17 +637,9 @@ function(get_bundle_keys app libs dirs keys_var)
# Add each prerequisite to the keys:
#
set(prereqs "")
- set(ignoreFile FALSE)
get_filename_component(prereq_filename ${exe} NAME)
- if(NOT CFG_IGNORE_ITEM STREQUAL "" )
- foreach(item ${CFG_IGNORE_ITEM})
- if(item STREQUAL prereq_filename)
- set(ignoreFile TRUE)
- endif()
- endforeach()
- endif()
- if(NOT ignoreFile)
+ if(NOT prereq_filename IN_LIST CFG_IGNORE_ITEM)
get_prerequisites("${exe}" prereqs 1 1 "${exepath}" "${dirs}"
"${exe_rpaths}")
foreach(pr ${prereqs})
set_bundle_key_values(${keys_var} "${exe}" "${pr}" "${exepath}"
"${dirs}" 1 "${exe_rpaths}")
@@ -1031,18 +1018,9 @@ function(verify_bundle_prerequisites bundle result_var
info_var)
message(STATUS "executable file ${count}: ${f}")
set(prereqs "")
- set(ignoreFile FALSE)
get_filename_component(prereq_filename ${f} NAME)
- if(NOT CFG_IGNORE_ITEM STREQUAL "" )
- foreach(item ${CFG_IGNORE_ITEM})
- if(item STREQUAL prereq_filename)
- set(ignoreFile TRUE)
- endif()
- endforeach()
- endif()
-
- if(NOT ignoreFile)
+ if(NOT prereq_filename IN_LIST CFG_IGNORE_ITEM)
get_item_rpaths(${f} _main_exe_rpaths)
get_prerequisites("${f}" prereqs 1 1 "${exepath}"
"${_main_exe_rpaths}")
@@ -1141,3 +1119,5 @@ function(verify_app app)
message(FATAL_ERROR "error: verify_app failed")
endif()
endfunction()
+
+cmake_policy(POP)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6695383dd5a7855321dc011158e30ec24a7cf902
commit 6695383dd5a7855321dc011158e30ec24a7cf902
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jun 14 08:30:34 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jun 17 17:49:31 2019 +0200
BundleUtilities: remove needless variable expansions in if() arguments
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index ca92f85..182720b 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -279,7 +279,7 @@ function(get_bundle_main_executable bundle result_var)
endif()
endforeach()
- if(NOT "${bundle_executable}" STREQUAL "")
+ if(NOT bundle_executable STREQUAL "")
if(EXISTS "${bundle}/Contents/MacOS/${bundle_executable}")
set(result "${bundle}/Contents/MacOS/${bundle_executable}")
else()
@@ -601,9 +601,9 @@ function(get_bundle_keys app libs dirs keys_var)
set(prereqs "")
set(ignoreFile FALSE)
get_filename_component(prereq_filename ${lib} NAME)
- if(NOT "${CFG_IGNORE_ITEM}" STREQUAL "" )
+ if(NOT CFG_IGNORE_ITEM STREQUAL "")
foreach(item ${CFG_IGNORE_ITEM})
- if("${item}" STREQUAL "${prereq_filename}")
+ if(item STREQUAL prereq_filename)
set(ignoreFile TRUE)
endif()
endforeach()
@@ -626,7 +626,7 @@ function(get_bundle_keys app libs dirs keys_var)
foreach(exe ${exes})
# Main executable is scanned first above:
#
- if(NOT "${exe}" STREQUAL "${executable}")
+ if(NOT exe STREQUAL executable)
# Add the exe itself to the keys:
#
set_bundle_key_values(${keys_var} "${exe}" "${exe}" "${exepath}"
"${dirs}" 0 "${main_rpaths}")
@@ -644,9 +644,9 @@ function(get_bundle_keys app libs dirs keys_var)
set(prereqs "")
set(ignoreFile FALSE)
get_filename_component(prereq_filename ${exe} NAME)
- if(NOT "${CFG_IGNORE_ITEM}" STREQUAL "" )
+ if(NOT CFG_IGNORE_ITEM STREQUAL "" )
foreach(item ${CFG_IGNORE_ITEM})
- if("${item}" STREQUAL "${prereq_filename}")
+ if(item STREQUAL prereq_filename)
set(ignoreFile TRUE)
endif()
endforeach()
@@ -664,7 +664,7 @@ function(get_bundle_keys app libs dirs keys_var)
# preserve library symlink structure
foreach(key ${${keys_var}})
- if("${${key}_COPYFLAG}" STREQUAL 1)
+ if("${${key}_COPYFLAG}" STREQUAL "1")
if(IS_SYMLINK "${${key}_RESOLVED_ITEM}")
get_filename_component(target "${${key}_RESOLVED_ITEM}" REALPATH)
set_bundle_key_values(${keys_var} "${exe}" "${target}" "${exepath}"
"${dirs}" 1 "${exe_rpaths}")
@@ -681,7 +681,7 @@ function(get_bundle_keys app libs dirs keys_var)
get_filename_component(resolved_item_compare
"${resolved_item_compare}" NAME)
get_filename_component(resolved_embedded_item_compare
"${resolved_embedded_item_compare}" NAME)
- if(NOT "${resolved_item_compare}" STREQUAL
"${resolved_embedded_item_compare}")
+ if(NOT resolved_item_compare STREQUAL resolved_embedded_item_compare)
set(${key}_COPYFLAG "2")
set(${key}_RESOLVED_ITEM "${${targetkey}_RESOLVED_EMBEDDED_ITEM}")
endif()
@@ -715,7 +715,7 @@ function(link_resolved_item_into_bundle resolved_item
resolved_embedded_item)
set(resolved_embedded_item_compare "${resolved_embedded_item}")
endif()
- if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+ if(resolved_item_compare STREQUAL resolved_embedded_item_compare)
message(STATUS "warning: resolved_item == resolved_embedded_item - not
linking...")
else()
get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY)
@@ -737,7 +737,7 @@ function(copy_resolved_item_into_bundle resolved_item
resolved_embedded_item)
set(resolved_embedded_item_compare "${resolved_embedded_item}")
endif()
- if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+ if(resolved_item_compare STREQUAL resolved_embedded_item_compare)
message(STATUS "warning: resolved_item == resolved_embedded_item - not
copying...")
else()
#message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item}
${resolved_embedded_item}")
@@ -760,7 +760,7 @@ function(copy_resolved_framework_into_bundle resolved_item
resolved_embedded_ite
set(resolved_embedded_item_compare "${resolved_embedded_item}")
endif()
- if("${resolved_item_compare}" STREQUAL "${resolved_embedded_item_compare}")
+ if(resolved_item_compare STREQUAL resolved_embedded_item_compare)
message(STATUS "warning: resolved_item == resolved_embedded_item - not
copying...")
else()
if(BU_COPY_FULL_FRAMEWORK_CONTENTS)
@@ -840,12 +840,12 @@ function(fixup_bundle_item resolved_embedded_item exepath
dirs)
string(LENGTH "${resolved_embedded_item}" resolved_embedded_item_length)
set(path_too_short 0)
set(is_embedded 0)
- if(${resolved_embedded_item_length} LESS ${exe_dotapp_dir_length})
+ if(resolved_embedded_item_length LESS exe_dotapp_dir_length)
set(path_too_short 1)
endif()
if(NOT path_too_short)
string(SUBSTRING "${resolved_embedded_item}" 0 ${exe_dotapp_dir_length}
item_substring)
- if("${exe_dotapp_dir}/" STREQUAL "${item_substring}")
+ if("${exe_dotapp_dir}/" STREQUAL item_substring)
set(is_embedded 1)
endif()
endif()
@@ -1034,9 +1034,9 @@ function(verify_bundle_prerequisites bundle result_var
info_var)
set(ignoreFile FALSE)
get_filename_component(prereq_filename ${f} NAME)
- if(NOT "${CFG_IGNORE_ITEM}" STREQUAL "" )
+ if(NOT CFG_IGNORE_ITEM STREQUAL "" )
foreach(item ${CFG_IGNORE_ITEM})
- if("${item}" STREQUAL "${prereq_filename}")
+ if(item STREQUAL prereq_filename)
set(ignoreFile TRUE)
endif()
endforeach()
@@ -1062,11 +1062,11 @@ function(verify_bundle_prerequisites bundle result_var
info_var)
gp_file_type("${f}" "${p}" p_type)
if(APPLE)
- if(NOT "${p_type}" STREQUAL "embedded" AND NOT "${p_type}"
STREQUAL "system")
+ if(NOT p_type STREQUAL "embedded" AND NOT p_type STREQUAL "system")
set(external_prereqs ${external_prereqs} "${p}")
endif()
else()
- if(NOT "${p_type}" STREQUAL "local" AND NOT "${p_type}" STREQUAL
"system")
+ if(NOT p_type STREQUAL "local" AND NOT p_type STREQUAL "system")
set(external_prereqs ${external_prereqs} "${p}")
endif()
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5333c0923b80f211bd7be1ec3a2a935d70481e8
commit d5333c0923b80f211bd7be1ec3a2a935d70481e8
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Fri Jun 14 08:17:33 2019 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jun 17 17:49:31 2019 +0200
BundleUtilities: simplify inclusion of GetPrerequisites
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index f94fc5c..ca92f85 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -246,8 +246,7 @@ endif()
# The functions defined in this file depend on the get_prerequisites function
# (and possibly others) found in:
#
-get_filename_component(BundleUtilities_cmake_dir "${CMAKE_CURRENT_LIST_FILE}"
PATH)
-include("${BundleUtilities_cmake_dir}/GetPrerequisites.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake")
function(get_bundle_main_executable bundle result_var)
-----------------------------------------------------------------------
Summary of changes:
Modules/BundleUtilities.cmake | 61 ++++++++++++++----------------------------
Modules/GetPrerequisites.cmake | 4 ++-
2 files changed, 23 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
