New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve flexibility of dependencies' locations on OS X #713

Merged
merged 2 commits into from Oct 9, 2014
Jump to file or symbol
Failed to load files and symbols.
+2 −2
Diff settings

Always

Just for now

Next

Improve flexibility of dependencies locations on OS X

 - Replaced @executable_path by @rpath for more flexibility
 - Updated freetype and sndfile libs as follow:

    install_name_tool -id "@rpath/../Frameworks/freetype.framework/Versions/A/freetype" freetype
    install_name_tool -id "@rpath/../Frameworks/sndfile.framework/Versions/A/sndfile" sndfile
  • Loading branch information...
mantognini committed Oct 7, 2014
commit ba1488ec972d7abfc5cda14e2f0d90437c10fa91
Copy path View file
@@ -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
Copy path View file
@@ -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
Binary file not shown.
Binary file not shown.
ProTip! Use n and p to navigate between commits in a pull request.