Set the C++ standards using qmake CONFIGs. (#10534)

- If these are not specified using the CONFIG setting qmake will add its own standard options, on EL7 for example, it adds `-std=gnu++11`
OpenModelica · Apr 12, 2023 · 930eb48 · 930eb48
1 parent 78fcfd6
commit 930eb48
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -33,6 +33,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
   QT += printsupport widgets webkitwidgets concurrent
 }
 
+# Set the C++ standard.
+CONFIG += c++14
+
 TARGET = OMEdit
 TEMPLATE = app
 

diff --git a/OMEdit/OMEditLIB/OMEditLIB.pro b/OMEdit/OMEditLIB/OMEditLIB.pro
@@ -33,6 +33,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
   QT += printsupport widgets webkitwidgets concurrent
 }
 
+# Set the C++ standard.
 CONFIG += c++14
 
 TARGET = OMEdit

diff --git a/OMNotebook/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro b/OMNotebook/OMNotebook/OMNotebookGUI/OMNotebookGUI.pro
@@ -9,6 +9,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT *= printsupport widgets webkitwidgets
 }
 
+# Set the C++ standard.
+CONFIG += c++14
+
 TRANSLATIONS = Resources/nls/OMNotebook_de_DE.ts
 
 TARGET = OMNotebook

diff --git a/OMPlot/OMPlot/OMPlotGUI/OMPlotGUI.pro b/OMPlot/OMPlot/OMPlotGUI/OMPlotGUI.pro
@@ -9,6 +9,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT *= printsupport widgets
 }
 
+# Set the C++ standard.
+CONFIG += c++14
+
 TARGET = OMPlot
 TEMPLATE = app
 CONFIG += console

diff --git a/OMPlot/OMPlot/OMPlotGUI/OMPlotLib.pro b/OMPlot/OMPlot/OMPlotGUI/OMPlotLib.pro
@@ -9,6 +9,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT *= printsupport widgets
 }
 
+# Set the C++ standard.
+CONFIG += c++14
+
 TARGET = OMPlot
 TEMPLATE = lib
 

diff --git a/OMShell/OMShell/OMShellGUI/OMShellGUI.pro b/OMShell/OMShell/OMShellGUI/OMShellGUI.pro
@@ -3,6 +3,9 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT *= printsupport widgets webkitwidgets
 }
 
+# Set the C++ standard.
+CONFIG += c++14
+
 TRANSLATIONS = \
   OMShell_de.ts \
   OMShell_sv.ts