From faa0a9113319f1715de7ec53881f8384a353a25e Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Mon, 29 Apr 2019 18:24:36 +0300
Subject: [PATCH] 0030682: Configuration, qmake - all warnings are suppressed
 on macOS target

Fixed inconsistency of compiler flags with genproj.
warn_on+QMAKE_CXXFLAGS_WARN_ON is now used instead of warn_off+QMAKE_CXXFLAGS.
Added No_Exception to DEFINES.
---
 adm/qmake/OccCppConfig.pri | 41 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/adm/qmake/OccCppConfig.pri b/adm/qmake/OccCppConfig.pri
index 88549c086e..d85502816a 100644
--- a/adm/qmake/OccCppConfig.pri
+++ b/adm/qmake/OccCppConfig.pri
@@ -12,13 +12,11 @@ CONFIG -= debug_and_release
 OccGitRoot = $$_PRO_FILE_PWD_/../../../..
 
 # Define compilation flags
-!win32 { DEFINES += OCC_CONVERT_SIGNALS }
-android {
-  CONFIG += warn_off
-  QMAKE_CFLAGS   += -fexceptions -Wno-ignored-qualifiers -Wall
-  QMAKE_CXXFLAGS += -fexceptions -Wno-ignored-qualifiers -Wall
-  #android-g++ { QMAKE_CXXFLAGS += -Wno-strict-overflow }
-} else:win32 {
+CONFIG += warn_on
+QMAKE_CFLAGS_WARN_ON   = -Wall
+QMAKE_CXXFLAGS_WARN_ON = -Wall
+win32 {
+  QMAKE_CFLAGS_WARN_ON   = -W4
   QMAKE_CXXFLAGS_WARN_ON = -W4
   QMAKE_CXXFLAGS_EXCEPTIONS_ON = /EHa
   QMAKE_CXXFLAGS_STL_ON = /EHa
@@ -39,15 +37,27 @@ android {
   DEFINES += _CRT_SECURE_NO_WARNINGS
   DEFINES += _CRT_NONSTDC_NO_DEPRECATE
   DEFINES += _SCL_SECURE_NO_WARNINGS
-} else:mac {
+} else {
   CONFIG += c++11
-  CONFIG += warn_off
-  QMAKE_CXXFLAGS += -Wall
+  QMAKE_CFLAGS   += -fexceptions
+  QMAKE_CXXFLAGS += -fexceptions
   QMAKE_CXXFLAGS += -fvisibility=default
-  iphoneos {
-    QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-  } else {
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
+  DEFINES += OCC_CONVERT_SIGNALS
+  mac {
+    iphoneos {
+      QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+    } else {
+      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+    }
+  }
+}
+!CONFIG(debug, debug|release) {
+  # disable exceptions in Release builds
+  DEFINES += No_Exception
+  HAVE_RelWithDebInfo {
+    win32 {
+      CONFIG += force_debug_info
+    }
   }
 }
 
@@ -126,9 +136,6 @@ win32 {
   QMAKE_SUBSTITUTES += occtkgen_libfolder
 
   LIBS += -L$$aLibDest
-  HAVE_RelWithDebInfo {
-    !CONFIG(debug, debug|release) { CONFIG += force_debug_info }
-  }
   equals(TEMPLATE, lib) {
     QMAKE_CLEAN += $$DESTDIR/$${TARGET}.dll
     QMAKE_CLEAN += $$aLibDest/$${TARGET}.lib
-- 
2.20.1