diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-23 10:32:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-24 10:45:29 +0000 |
| commit | 3ec359303553b5d0d439236bba4d2d971152c5f5 (patch) | |
| tree | 4c9d9ec4b416975e390b6cc578406dcccd1881ca | |
| parent | ff5e2618d98cc547ebb2e4ff24e2ab5bb97f8168 (diff) | |
| download | qtlocation-3ec359303553b5d0d439236bba4d2d971152c5f5.tar.gz | |
Use appropriate qmake flags for optimizations
Using optimize_full gives us -O3 also on icc and clang, and -O3 already
implies -ftree-vectorize, and -ffast-math already implies unsafe-math-
optimizations.
Change-Id: Ieb1a6841da1ea3513ae624bf2468554bc62318c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| -rw-r--r-- | src/3rdparty/clip2tri/clip2tri.pro | 7 | ||||
| -rw-r--r-- | src/3rdparty/clipper/clipper.pro | 9 | ||||
| -rw-r--r-- | src/3rdparty/poly2tri/poly2tri.pro | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro index 7217de42..802c0409 100644 --- a/src/3rdparty/clip2tri/clip2tri.pro +++ b/src/3rdparty/clip2tri/clip2tri.pro @@ -1,6 +1,6 @@ TARGET = clip2tri -CONFIG += staticlib exceptions warn_off +CONFIG += staticlib exceptions warn_off optimize_full INCLUDEPATH += ../poly2tri INCLUDEPATH += ../clipper @@ -10,8 +10,9 @@ load(qt_helper_lib) # workaround for QTBUG-31586 contains(QT_CONFIG, c++11): CONFIG += c++11 -*-g++* { - QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations -Wno-error=return-type +gcc { + QMAKE_CFLAGS_OPTIMIZE_FULL += -ffast-math + !clang:!intel_icc:!rim_qcc: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=return-type } HEADERS += clip2tri.h diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro index 7ced65ac..874d55c5 100644 --- a/src/3rdparty/clipper/clipper.pro +++ b/src/3rdparty/clipper/clipper.pro @@ -1,16 +1,15 @@ TARGET = clipper -CONFIG += staticlib -CONFIG += exceptions -CONFIG += warn_off +CONFIG += staticlib exceptions warn_off optimize_full load(qt_helper_lib) # workaround for QTBUG-31586 contains(QT_CONFIG, c++11): CONFIG += c++11 -*-g++* { - QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations -Wno-error=return-type +gcc { + QMAKE_CFLAGS_OPTIMIZE_FULL += -ffast-math + !clang:!intel_icc:!rim_qcc: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=return-type } HEADERS += clipper.h diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro index 90dfbbd1..76f2779e 100644 --- a/src/3rdparty/poly2tri/poly2tri.pro +++ b/src/3rdparty/poly2tri/poly2tri.pro @@ -1,14 +1,15 @@ TARGET = poly2tri -CONFIG += staticlib warn_off +CONFIG += staticlib warn_off optimize_full load(qt_helper_lib) # workaround for QTBUG-31586 contains(QT_CONFIG, c++11): CONFIG += c++11 -*-g++* { - QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations -Wno-error=return-type +gcc { + QMAKE_CFLAGS_OPTIMIZE_FULL += -ffast-math + !clang:!intel_icc:!rim_qcc: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=return-type } HEADERS += poly2tri.h \ |