diff options
| author | vng <viktor.govako@gmail.com> | 2015-04-20 17:56:16 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:46:11 +0300 |
| commit | c7e0a67c1b04e6341c89d6e81adc407aa554073a (patch) | |
| tree | e1123ebaab7b7a7ca82019d5da542e4dd6ba09ed /common.pri | |
| parent | 66592504885819c27e092be779dbe1b668b3bca8 (diff) | |
[qmake] Use depend_includepath for correct compilation.
Diffstat (limited to 'common.pri')
| -rw-r--r-- | common.pri | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common.pri b/common.pri index 66283e092c..4962069a29 100644 --- a/common.pri +++ b/common.pri @@ -16,17 +16,17 @@ VERSION_MINOR = 4 # qt's variable VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR} -# Additional include directories, common to most projects. -# /../omim part is used to avoid qmake issue when whole project -# recompiles without any modification. -INCLUDEPATH *= $$ROOT_DIR/../omim -DEPENDPATH *= $$ROOT_DIR/../omim +# ROOT_DIR is in INCLUDEPATH now according to the new include policy. +INCLUDEPATH *= $$ROOT_DIR +# Do not set DEPENDPATH - it causes rebuild all with minor changes. +#DEPENDPATH *= $$ROOT_DIR INCLUDEPATH *= $$ROOT_DIR/3party/boost INCLUDEPATH *= $$ROOT_DIR/3party/glm # Hack for Qt5 qmake to make it much faster. # Turns off any external headers modification check (see DEPENDPATH). -CONFIG -= depend_includepath +# Do not remove depend_includepath in CONFIG. Need to check modifications within ROOT_DIR. +#CONFIG -= depend_includepath CONFIG *= c++11 |