Merge branch 'RB-2.4' into RB-2.5

NatronGitHub · Nov 25, 2022 · 79eb7ed · 79eb7ed
2 parents 4e3acfc + a542c14
commit 79eb7ed
Showing 1 changed file with 34 additions and 5 deletions.
diff --git a/global.pri b/global.pri
@@ -308,12 +308,28 @@ macx-clang-libc++ {
     # in Qt 4.8.7, objective-C misses the stdlib and macos version flags
     QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
     QMAKE_OBJECTIVE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
+    c++11 {
+      c++14 {
+        QMAKE_OBJECTIVE_CXXFLAGS += -std=c++14
+      }
+      !c++14 {
+        QMAKE_OBJECTIVE_CXXFLAGS += -std=c++11
+      }
+    }
 }
 
 macx-clang {
     # in Qt 4.8.7, objective-C misses the stdlib and macos version flags
     QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
     QMAKE_OBJECTIVE_CXXFLAGS += -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET
+    c++11 {
+      c++14 {
+        QMAKE_OBJECTIVE_CXXFLAGS += -std=c++14
+      }
+      !c++14 {
+        QMAKE_OBJECTIVE_CXXFLAGS += -std=c++11
+      }
+    }
 }
 
 CONFIG(debug) {
@@ -509,18 +525,31 @@ unix {
   symbols_hidden_by_default.value = YES
   QMAKE_MAC_XCODE_SETTINGS += symbols_hidden_by_default
   c++11 {
-    QMAKE_CXXFLAGS += -std=c++11
-    enable_cxx11.name = CLANG_CXX_LANGUAGE_STANDARD
-    enable_cxx11.value = c++0x
-    QMAKE_MAC_XCODE_SETTINGS += enable_cxx11
+    c++14 {
+      QMAKE_CXXFLAGS += -std=c++14
+      enable_cxx14.name = CLANG_CXX_LANGUAGE_STANDARD
+      enable_cxx14.value = c++14
+      QMAKE_MAC_XCODE_SETTINGS += enable_cxx14
+    }
+    !c++14 {
+      QMAKE_CXXFLAGS += -std=c++11
+      enable_cxx11.name = CLANG_CXX_LANGUAGE_STANDARD
+      enable_cxx11.value = c++0x
+      QMAKE_MAC_XCODE_SETTINGS += enable_cxx11
+    }
   }
 }
 
 *clang* {
   QMAKE_CXXFLAGS += -ftemplate-depth-1024
   QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
   c++11 {
-    QMAKE_CXXFLAGS += -std=c++11
+    c++14 {
+      QMAKE_CXXFLAGS += -std=c++14
+    }
+    !c++14 {
+      QMAKE_CXXFLAGS += -std=c++11
+    }
   }
 }