ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: move CMAKE_MACOSX_RPATH with rest of macOS logic

This commit is contained in:
Michael Maltese 2017-01-24 00:45:57 -08:00
parent b65b87c8b4
commit c85127c973
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -73,10 +73,6 @@ endif()
# TODO: Add DSPSpy # TODO: Add DSPSpy
option(DSPTOOL "Build dsptool" OFF) option(DSPTOOL "Build dsptool" OFF)
if (APPLE)
# This doesn't play with with the packaging script that doesn't understand @rpath
set(CMAKE_MACOSX_RPATH OFF)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
# Libraries to link # Libraries to link
set(LIBS) set(LIBS)
@ -284,6 +280,9 @@ if(ENABLE_LTO)
endif() endif()
if(APPLE) if(APPLE)
# This doesn't play well with the packaging script that doesn't understand @rpath
set(CMAKE_MACOSX_RPATH OFF)
if(NOT OSX_USE_DEFAULT_SEARCH_PATH) if(NOT OSX_USE_DEFAULT_SEARCH_PATH)
# Hack up the path to prioritize the path to built-in OS libraries to # Hack up the path to prioritize the path to built-in OS libraries to
# increase the chance of not depending on a bunch of copies of them # increase the chance of not depending on a bunch of copies of them