From d66f0222f2eb34e4f4ea8e774247c19b64e7be67 Mon Sep 17 00:00:00 2001 From: stopiccot Date: Sun, 23 Feb 2014 16:40:55 +0000 Subject: [PATCH] more portable OS X library install names --- lib/CMakeLists.txt | 2 +- lib/minizip/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 343d06719..0293d281e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -104,7 +104,7 @@ set(lib_HEADERS ) add_library(vcmi SHARED ${lib_SRCS} ${lib_HEADERS}) -set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@executable_path/libvcmi.dylib") +set_target_properties(vcmi PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@rpath/libvcmi.dylib") target_link_libraries(vcmi minizip ${Boost_LIBRARIES} ${SDL_LIBRARY} ${ZLIB_LIBRARIES} ${RT_LIB} ${DL_LIB}) set_target_properties(vcmi PROPERTIES ${PCH_PROPERTIES}) diff --git a/lib/minizip/CMakeLists.txt b/lib/minizip/CMakeLists.txt index 75d591731..bf4e8b95d 100644 --- a/lib/minizip/CMakeLists.txt +++ b/lib/minizip/CMakeLists.txt @@ -12,7 +12,7 @@ set(lib_SRCS ) add_library(minizip SHARED ${lib_SRCS}) -set_target_properties(minizip PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@executable_path/libminizip.dylib") +set_target_properties(minizip PROPERTIES XCODE_ATTRIBUTE_LD_DYLIB_INSTALL_NAME "@rpath/libminizip.dylib") target_link_libraries(minizip ${ZLIB_LIBRARIES}) if (NOT APPLE) # Already inside vcmiclient bundle