diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-07-01 16:10:43 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-01 17:17:58 +0200 |
| commit | 825ca4975653654bb400b6827fda19f1eec0ee15 (patch) | |
| tree | 14c108159482fcb966ede3a6e0660ac651da35ed | |
| parent | 9d881e1731e9c6bdc3728f59e57f49d04b0a79d6 (diff) | |
Fix the Linux build
Frameworks are only needed on Mac.
Change-Id: Ic76a04e42ce1e6032b52c10276feef8abd616c1f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 4566b46f9..d2d5886d6 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -48,28 +48,28 @@ GYPI_CONTENTS = "{" \ for (lib, LIBS): GYPI_CONTENTS += " '$$lib'," !isEmpty(QMAKE_RPATHDIR): GYPI_CONTENTS += " '$$QMAKE_RPATH$$QMAKE_RPATHDIR'," -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'," -} +GYPI_CONTENTS += " ]," -FRAMEWORK_PATHS = $$find(LIBS, "-F*") -FRAMEWORK_PATHS = $$unique(FRAMEWORK_PATHS) -FRAMEWORK_PATHS -= "-framework" -for (framework_path, FRAMEWORK_PATHS): GYPI_CONTENTS += " '$$framework_path'," +macx { + 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 += " ]," \ + GYPI_CONTENTS += " ]," \ " }," - - +} !isEmpty(GYPDEPENDENCIES) { GYPI_CONTENTS += " 'dependencies': [" |