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 1fe3d126a571427114d56e1115e73feb06cd5c3e (commit)
via 200bf5774285d51d9c5f24b5b52226a7cb54d33d (commit)
from c9854a5843ac75df32c26140e1b568a3f0018699 (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=1fe3d126a571427114d56e1115e73feb06cd5c3e
commit 1fe3d126a571427114d56e1115e73feb06cd5c3e
Merge: c9854a5 200bf57
Author: Craig Scott <[email protected]>
AuthorDate: Wed Jan 9 21:41:27 2019 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Wed Jan 9 16:41:38 2019 -0500
Merge topic 'BundleUtilities-make-dir'
200bf57742 BundleUtilities: Ensure target dir exists when creating symlinks
Acked-by: Kitware Robot <[email protected]>
Tested-by: Craig Scott <[email protected]>
Merge-request: !2728
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=200bf5774285d51d9c5f24b5b52226a7cb54d33d
commit 200bf5774285d51d9c5f24b5b52226a7cb54d33d
Author: Tim Blechmann <[email protected]>
AuthorDate: Tue Dec 11 23:48:53 2018 +0800
Commit: Craig Scott <[email protected]>
CommitDate: Tue Jan 8 19:56:34 2019 +1100
BundleUtilities: Ensure target dir exists when creating symlinks
Commit v3.13.0-rc1~279^2 (GetPrerequisites: Move dylibs from MacOS
to Frameworks folder in bundle, 2018-07-22) introduced a regression
that can cause symlink creation to fail during packaging. Symlinks
can be created before targets are installed, so the destination
directory of the symlink sometimes won't exist at symlink creation.
Fixes: #18726
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 613ba1a..89ca918 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -720,6 +720,9 @@ function(link_resolved_item_into_bundle resolved_item
resolved_embedded_item)
else()
get_filename_component(target_dir "${resolved_embedded_item}" DIRECTORY)
file(RELATIVE_PATH symlink_target "${target_dir}" "${resolved_item}")
+ if (NOT EXISTS "${target_dir}")
+ file(MAKE_DIRECTORY "${target_dir}")
+ endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${symlink_target}" "${resolved_embedded_item}")
endif()
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Modules/BundleUtilities.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
