Merge remote-tracking branch 'origin/RB-2.3'

Author: devernay

INSTALL_OSX.md

@@ -217,7 +217,10 @@ cat > config.pri << EOF
 boost: INCLUDEPATH += /opt/local/include
 boost-serialization-lib: LIBS += -lboost_serialization-mt
 boost: LIBS += -L/opt/local/lib -lboost_thread-mt -lboost_system-mt
-openmp {
+macx:openmp {
+  QMAKE_CC=/opt/local/bin/clang-mp-5.0
+  QMAKE_CXX=/opt/local/bin/clang++-mp-5.0
+  
   INCLUDEPATH += /opt/local/include/libomp
   LIBS += -L/opt/local/lib/libomp -liomp5
   cc_setting.name = CC
@@ -248,7 +251,10 @@ boost: LIBS += -L/usr/local/lib -lboost_thread-mt -lboost_system-mt
 expat: PKGCONFIG -= expat
 expat: INCLUDEPATH += /usr/local/opt/expat/include
 expat: LIBS += -L/usr/local/opt/expat/lib -lexpat
-openmp {
+macx:openmp {
+  QMAKE_CC=/usr/local/opt/llvm/bin/clang
+  QMAKE_CXX=/usr/local/opt/llvm/bin/clang++
+
   LIBS += -L/usr/local/opt/llvm/lib -liomp5
   cc_setting.name = CC
   cc_setting.value = /usr/local/opt/llvm/bin/clang

global.pri

@@ -64,10 +64,16 @@ run-without-python {
         QMAKE_LFLAGS_RELEASE =
     }
     CONFIG(fast) {
-        QMAKE_CFLAGS += -Ofast
-        QMAKE_CFLAGS -= -O2 -O3
-        QMAKE_CXXFLAGS += -Ofast
-        QMAKE_CXXFLAGS -= -O2 -O3
+        QMAKE_CFLAGS_RELEASE += -Ofast
+        QMAKE_CFLAGS_RELEASE -= -O -O2 -O3
+        QMAKE_CXXFLAGS_RELEASE += -Ofast
+        QMAKE_CXXFLAGS_RELEASE -= -O -O2 -O3
+        QMAKE_CFLAGS_DEBUG += -Ofast
+        QMAKE_CFLAGS_DEBUG -= -O -O2 -O3
+        QMAKE_CXXFLAGS_DEBUG += -Ofast
+        QMAKE_CXXFLAGS_DEBUG -= -O -O2 -O3
+        QMAKE_CXXFLAGS -= -O -O2 -O3
+        QMAKE_CFLAGS -= -O -O2 -O3
     }
 }