diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-19 16:58:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 17:31:10 +0100 |
| commit | e8f3b904205a8863c2fe9b0d1b020b27feb0c834 (patch) | |
| tree | b70799801f4248422f19d28f008f1e6edc352db8 /build/qmake/mkspecs/features/gyp_generator.prf | |
| parent | e7000fee039cfc60678f8703b8633694b5fa1070 (diff) | |
Fix the dyld error when running examples and tests on Mac.
Make sure that the install_name is set properly when linking the core library.
It would normally be possible to set this to <(PRODUCT_DIR) and let
gyp handle this, but this isn't supported (see gyp.XcodeSettings.GetInstallName)
so let qmake resolve the path.
This should be removed to use something relative to @loader_path that
would resolve this path to the Qt module libraries once we have proper
installation logic in place for the core library.
Change-Id: Id617afdf95c4aede6802e55b05deffe3218be82e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'build/qmake/mkspecs/features/gyp_generator.prf')
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 5288e7c19..6ad3e476c 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -139,6 +139,11 @@ GYP_CONTENTS += " ]," \ " }," \ " }," } +!isEmpty(GYP_DYLIB_INSTALL_NAME_BASE) { + GYP_CONTENTS += " 'xcode_settings': {" \ + " 'DYLIB_INSTALL_NAME_BASE': '$$GYP_DYLIB_INSTALL_NAME_BASE'," \ + " }," +} # Source files to compile GYP_CONTENTS += " 'sources': [" |