osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't add rpaths with CMake, either; osx-app.sh will do so. 

Change-Id: Ie8f39e5e89ed8dc21c66ee7f1235c406c3028304
Reviewed-on: https://code.wireshark.org/review/9613
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-07-12 19:54:15 -07:00
parent c305f08921
commit c6aa2b5b2c
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1623,17 +1623,9 @@ if(ENABLE_APPLICATION_BUNDLE)
# with a static version installed in /usr/local/lib rather than
# the system version in /usr/lib).
#
# Also add -Wl,-rpath,@executable_path/../Frameworks,
# -Wl,-rpath,@executable_path/../lib and
# -Wl,-rpath,/usr/local/lib, so that, if we build an app
# bundle, we can tweak all the executable images, shared
# libraries, and plugins in the bundle to look for non-system
# libraries in the rpath, rather than having a script tweak
# DYLD_LIBRARY_PATH.
#
set(CMAKE_EXE_LINKER_FLAGS
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,@executable_path/../lib -Wl,-rpath,/usr/local/lib ${CMAKE_EXE_LINKER_FLAGS}"
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first ${CMAKE_EXE_LINKER_FLAGS}"
)
# Add files to the app bundle