mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 04:09:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle

Browse Source 
Fixes: #16828
This commit is contained in:
Harry Mallon
2018-07-22 12:05:14 +01:00
committed by Brad King
parent c2d22dc4b4
commit dce77d9ad9
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/GetPrerequisites.cmake
+4 -14
View File
@@ -275,7 +275,6 @@ function(gp_item_default_embedded_path item default_embedded_path_var)
# as the executable by default: # as the executable by default:
# #
set(path "@executable_path") set(path "@executable_path")
set(overridden 0)
# On the Mac, relative to the executable depending on the type # On the Mac, relative to the executable depending on the type
# of the thing we are embedding: # 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") 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$") if(item MATCHES "[^/]+\\.framework/" OR item MATCHES "\\.dylib$")
set(path "@executable_path/../MacOS") set(path "@executable_path/../Frameworks")
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()
endif() endif()
endif() endif()