diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-12-16 14:28:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-22 11:54:03 +0100 |
| commit | 9bebb025af94f9f8c5ba973a392d7a862b7e1712 (patch) | |
| tree | 63e07ce2943c4d48ea0335ca9dbfb062acda3230 /configure | |
| parent | 6ce5533172e0902538690738c018bd7092016ecd (diff) | |
handle configure's -I flags like configure.exe does
it's more correct that way.
Task-number: QTBUG-35588
Change-Id: I8dc55d6cd7dc08ebafd458b3df54fd69c3d91849
Reviewed-by: William Gallafent <william@gallaf.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -694,6 +694,7 @@ CFG_EVENTFD=auto CFG_RPATH=yes CFG_FRAMEWORK=auto DEFINES= +INCLUDES= D_FLAGS= I_FLAGS= L_FLAGS= @@ -1985,6 +1986,7 @@ while [ "$#" -gt 0 ]; do D_FLAGS="$D_FLAGS -D\"$VAL\"" ;; add_ipath) + INCLUDES="$INCLUDES \"$VAL\"" I_FLAGS="$I_FLAGS -I\"${VAL}\"" ;; add_lpath) @@ -5871,6 +5873,7 @@ fi [ "$CFG_DIRECTWRITE" = "yes" ] && QT_CONFIG="$QT_CONFIG directwrite" [ '!' -z "$DEFINES" ] && QMakeVar add DEFINES "$DEFINES" +[ '!' -z "$INCLUDES" ] && QMakeVar add INCLUDEPATH "$INCLUDES" [ '!' -z "$L_FLAGS" ] && QMakeVar add LIBS "$L_FLAGS" if [ "$XPLATFORM_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then @@ -5898,12 +5901,6 @@ if [ "$CFG_RPATH" = "yes" ]; then QT_CONFIG="$QT_CONFIG rpath" fi -if [ '!' -z "$I_FLAGS" ]; then - # add the user define include paths - QMakeVar add QMAKE_CFLAGS "$I_FLAGS" - QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS" -fi - if [ '!' -z "$W_FLAGS" ]; then # add the user defined warning flags QMakeVar add QMAKE_CFLAGS_WARN_ON "$W_FLAGS" |