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.
+5 −2
Diff settings

Always

Just for now

View
@@ -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
View
@@ -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.
@@ -127,6 +127,9 @@ subject to the following restrictions:
<dict>
<key>INFOPLIST_FILE</key>
<string>___PACKAGENAME___/___PACKAGENAME___-Info.plist</string>

This comment has been minimized.

@eXpl0it3r

eXpl0it3r Oct 9, 2014

Member

Do you want this empty line here? (Not that it would matter...)

This comment has been minimized.

@mantognini

mantognini Oct 9, 2014

Member

Yep, I prefer to separate each <key> visually if they are not directly related to each other. :-)

<key>LD_RUNPATH_SEARCH_PATHS</key>
<string>@loader_path/../Frameworks</string>
</dict>
</dict>
</array>
ProTip! Use n and p to navigate between commits in a pull request.