Commit 35c55662 authored by yzshen@chromium.org's avatar yzshen@chromium.org

Mojo interface libraries: set install name and search path properly on Mac.

This fixed the Mac non-component build.

BUG=346766
TEST=Mojo tests (non-component build) work on Mac
R=thakis@chromium.org, viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/188693006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255791 0039d316-1c4b-4281-b951-d872f2087c98
parent 7fa76d13
......@@ -23,6 +23,20 @@
'public/system/macros.h',
'public/system/system_export.h',
],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
# Make it a run-path dependent library.
'DYLIB_INSTALL_NAME_BASE': '@rpath',
},
'direct_dependent_settings': {
'xcode_settings': {
# Look for run-path dependent libraries in the loader's directory.
'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
},
},
}],
],
},
{
'target_name': 'mojo_gles2',
......@@ -51,6 +65,20 @@
'public/gles2/gles2_private.cc',
'public/gles2/gles2_private.h',
],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
# Make it a run-path dependent library.
'DYLIB_INSTALL_NAME_BASE': '@rpath',
},
'direct_dependent_settings': {
'xcode_settings': {
# Look for run-path dependent libraries in the loader's directory.
'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
},
},
}],
],
},
{
'target_name': 'mojo_test_support',
......@@ -72,6 +100,20 @@
'public/tests/test_support_private.h',
'public/tests/test_support_export.h',
],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
# Make it a run-path dependent library.
'DYLIB_INSTALL_NAME_BASE': '@rpath',
},
'direct_dependent_settings': {
'xcode_settings': {
# Look for run-path dependent libraries in the loader's directory.
'LD_RUNPATH_SEARCH_PATHS': [ '@loader_path/.', ],
},
},
}],
],
},
{
'target_name': 'mojo_public_test_utils',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment