Merge branch 'feature/rpath_osx'

2014-10-09 09:11:23 +02:00 · 2014-10-09 09:11:23 +02:00 · c348171f24
commit c348171f24
parent b2ba2307b3 9a8ba74c62
5 changed files with 5 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -232,7 +232,7 @@ else()
    # NOTE: it's not required to link agains SFML.framework
    set_target_properties(SFML PROPERTIES
                          BUILD_WITH_INSTALL_RPATH 1
-                          INSTALL_NAME_DIR "@executable_path/../Frameworks")
+                          INSTALL_NAME_DIR "@rpath")

    # install rule
    install(TARGETS SFML
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@ -84,7 +84,7 @@ macro(sfml_add_library target)
        # adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
        set_target_properties(${target} PROPERTIES
                              BUILD_WITH_INSTALL_RPATH 1
-                              INSTALL_NAME_DIR "@executable_path/../Frameworks")
+                              INSTALL_NAME_DIR "@rpath")
    endif()

    # enable automatic reference counting on iOS
--- a/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype
+++ b/extlibs/libs-osx/Frameworks/freetype.framework/Versions/A/freetype
--- a/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile
+++ b/extlibs/libs-osx/Frameworks/sndfile.framework/Versions/A/sndfile
--- a/Bundle.xctemplate/TemplateInfo.plist
+++ b/Bundle.xctemplate/TemplateInfo.plist
@ -127,6 +127,9 @@ subject to the following restrictions:
                <dict>
                    <key>INFOPLIST_FILE</key>
                    <string>___PACKAGENAME___/___PACKAGENAME___-Info.plist</string>
+
+                    <key>LD_RUNPATH_SEARCH_PATHS</key>
+                    <string>@loader_path/../Frameworks</string>
                </dict>
            </dict>
        </array>