diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-07-07 13:47:49 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-13 19:51:34 +0000 |
| commit | 4cb3c3e15aba83a32f5b4ddcf4561bc231aa4dc2 (patch) | |
| tree | 19c890f9636a243e0705b2002b21817c02e65dd3 /configure.pri | |
| parent | 6f1ad48a9115ff415b0496927451d0f7f5ea284c (diff) | |
Replace EXTRA_LIBS with EXTRA_LIBDIR and EXTRA_FRAMEWORKPATH
Now that -l and -fw options are gone, using a combined EXTRA_LIBS
makes no sense anymore and only complicates things.
Change-Id: Ic12bf482f3bed041aff7f0891f008b1f34ae2b4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/configure.pri b/configure.pri index 76438f2c20..7625074c50 100644 --- a/configure.pri +++ b/configure.pri @@ -584,16 +584,15 @@ defineTest(qtConfOutput_compilerFlags) { output += "EXTRA_INCLUDEPATH += $$config.input.includes" } - libs = $$join(config.input.lpaths, " -L", "-L") - - darwin: \ - libs += $$join(config.input.fpaths, " -F", "-F") - - !isEmpty(libs) { - EXTRA_LIBS += $$libs - export(EXTRA_LIBS) - - output += "EXTRA_LIBS += $$libs" + !isEmpty(config.input.lpaths) { + EXTRA_LIBDIR += $$config.input.lpaths + export(EXTRA_LIBDIR) + output += "EXTRA_LIBDIR += $$config.input.lpaths" + } + darwin:!isEmpty(config.input.fpaths) { + EXTRA_FRAMEWORKPATH += $$config.input.fpaths + export(EXTRA_FRAMEWORKPATH) + output += "EXTRA_FRAMEWORKPATH += $$config.input.fpaths" } config.output.privatePro += $$output |