[Cmake-commits] CMake branch, master, updated. v3.12.0-300-g946318a

[Kitware Robot]

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  946318a1ef16d1b69c388500638783b370590212 (commit)
       via  dce77d9ad99f5f57f22cb9e259e685c12ca0281f (commit)
      from  3ab6f056dc8765c98e62a04a16fa24f23f201b7a (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=946318a1ef16d1b69c388500638783b370590212
commit 946318a1ef16d1b69c388500638783b370590212
Merge: 3ab6f05 dce77d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 25 14:24:04 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 25 10:24:10 2018 -0400

    Merge topic 'GetPrerequisites-dylibsframeworks'
    
    dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2229


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dce77d9ad99f5f57f22cb9e259e685c12ca0281f
commit dce77d9ad99f5f57f22cb9e259e685c12ca0281f
Author:     Harry Mallon <hjmallon at gmail.com>
AuthorDate: Sun Jul 22 12:05:14 2018 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 24 14:07:22 2018 -0400

    GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle
    
    Fixes: #16828

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index d397791..ca71009 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -275,7 +275,6 @@ function(gp_item_default_embedded_path item default_embedded_path_var)
   # as the executable by default:
   #
   set(path "@executable_path")
-  set(overridden 0)
 
   # On the Mac, relative to the executable depending on the type
   # of the thing we are embedding:
@@ -294,20 +293,11 @@ function(gp_item_default_embedded_path item default_embedded_path_var)
     #
     set(path "@executable_path/../../Contents/MacOS")
 
-    # Embed .dylibs right next to the main bundle executable:
+    # Embed frameworks and .dylibs in the embedded "Frameworks" directory
+    # (sibling of MacOS):
     #
-    if(item MATCHES "\\.dylib$")
-      set(path "@executable_path/../MacOS")
-      set(overridden 1)
-    endif()
-
-    # Embed frameworks in the embedded "Frameworks" directory (sibling of MacOS):
-    #
-    if(NOT overridden)
-      if(item MATCHES "[^/]+\\.framework/")
-        set(path "@executable_path/../Frameworks")
-        set(overridden 1)
-      endif()
+    if(item MATCHES "[^/]+\\.framework/" OR item MATCHES "\\.dylib$")
+      set(path "@executable_path/../Frameworks")
     endif()
   endif()
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/GetPrerequisites.cmake | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake