diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-06-28 16:36:58 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-01 14:42:47 +0200 |
| commit | e4272b57ac56a29ee763054181d499cc1014b88b (patch) | |
| tree | d64d0eddc0095afa0cb5205f675468e4fc137163 /build/qmake/mkspecs/features/gyp_generator.prf | |
| parent | 2c17b45c3d3ffa5f1630218947d21d3fc086de20 (diff) | |
[Mac] qmake needs to forward frameworks and paths to gyp.
Change-Id: I20dd425412f1354f9cf45e7c6c2977f73142efb6
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'build/qmake/mkspecs/features/gyp_generator.prf')
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index b01a9bb6c..4566b46f9 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -48,7 +48,28 @@ GYPI_CONTENTS = "{" \ for (lib, LIBS): GYPI_CONTENTS += " '$$lib'," !isEmpty(QMAKE_RPATHDIR): GYPI_CONTENTS += " '$$QMAKE_RPATH$$QMAKE_RPATHDIR'," -GYPI_CONTENTS += " ]," +GYPI_CONTENTS += " ]," \ + " 'link_settings': {" \ + " 'libraries': [" +FRAMEWORKS = $$find(LIBS, "Q*") +FRAMEWORKS = $$unique(FRAMEWORKS) +FRAMEWORKS ~= s/-.*/ +FRAMEWORKS -= "-framework" +for (framework, FRAMEWORKS): { + framework_name = $$join(framework, "", "", ".framework") + GYPI_CONTENTS += " '$$framework_name'," +} + +FRAMEWORK_PATHS = $$find(LIBS, "-F*") +FRAMEWORK_PATHS = $$unique(FRAMEWORK_PATHS) +FRAMEWORK_PATHS -= "-framework" +for (framework_path, FRAMEWORK_PATHS): GYPI_CONTENTS += " '$$framework_path'," + + +GYPI_CONTENTS += " ]," \ + " }," + + !isEmpty(GYPDEPENDENCIES) { GYPI_CONTENTS += " 'dependencies': [" |