diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-25 14:24:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-25 14:24:10 (GMT) |
| commit | 946318a1ef16d1b69c388500638783b370590212 (patch) | |
| tree | 85fea456e4497ef3734cb1e454d66b7af64f9c16 /Modules | |
| parent | 3ab6f056dc8765c98e62a04a16fa24f23f201b7a (diff) | |
| parent | dce77d9ad99f5f57f22cb9e259e685c12ca0281f (diff) | |
| download | CMake-946318a1ef16d1b69c388500638783b370590212.zip CMake-946318a1ef16d1b69c388500638783b370590212.tar.gz CMake-946318a1ef16d1b69c388500638783b370590212.tar.bz2 | |
Merge topic 'GetPrerequisites-dylibsframeworks'
dce77d9ad9 GetPrerequisites: Move dylibs from MacOS to Frameworks folder in bundle
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2229
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GetPrerequisites.cmake | 18 |
1 files changed, 4 insertions, 14 deletions
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() |