Use C++14 by default (#7965)

OpenModelica · Oct 9, 2021 · 618c742 · 618c742
1 parent 188f375
commit 618c742
Show file tree

Hide file tree

Showing 8 changed files with 976 additions and 185 deletions.
diff --git a/OMCompiler/configure.ac b/OMCompiler/configure.ac
@@ -299,14 +299,8 @@ AC_LANG_POP([C++])
 
 fi
 
-m4_include([common/m4/ax_cxx_compile_stdcxx_11.m4])
-HAVE_CXX_STD=0
-for flag in $CXXFLAGS; do
-  (echo $flag | grep -q "^-std=") && HAVE_CXX_STD=1
-done
-if test "$HAVE_CXX_STD" = 0; then
-  AX_CXX_COMPILE_STDCXX_11([noext],[optional])
-fi
+m4_include([common/m4/ax_cxx_compile_stdcxx.m4])
+AX_CXX_COMPILE_STDCXX(14,[noext],[optional])
 
 if test "`getconf LONG_BIT`" = "32"; then
 dnl Simulations spin forever unless -msse2 -mfpmath=sse is set

diff --git a/OMEdit/configure.ac b/OMEdit/configure.ac
@@ -18,7 +18,7 @@ AC_SUBST(LIB_BOOST_REGEX)
 m4_include([common/m4/pre-commit.m4])
 cp common/install-sh common/config.guess common/config.sub ./
 m4_include([common/m4/ombuilddir.m4])
-m4_include([common/m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([common/m4/ax_cxx_compile_stdcxx.m4])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -29,8 +29,10 @@ test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
 AC_LANG([C++])
 AC_PROG_CC
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
-
+AX_CXX_COMPILE_STDCXX(17, [noext],[optional])
+if test "$ax_cv_cxx_compile_cxx17__std_cpp17" != "yes"; then
+  AX_CXX_COMPILE_STDCXX(14, [noext],[mandatory])
+fi
 host_short=$host_cpu-$host_os
 
 m4_include([common/m4/qmake.m4])

diff --git a/OMNotebook/configure.ac b/OMNotebook/configure.ac
@@ -12,7 +12,7 @@ AC_SUBST(host_short)
 m4_include([common/m4/pre-commit.m4])
 cp common/install-sh common/config.guess common/config.sub ./
 m4_include([common/m4/ombuilddir.m4])
-m4_include([common/m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([common/m4/ax_cxx_compile_stdcxx.m4])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -23,7 +23,7 @@ AC_LANG([C++])
 test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
 AC_PROG_CC
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
+AX_CXX_COMPILE_STDCXX(14,[noext],[mandatory])
 
 host_short=$host_cpu-$host_os
 

diff --git a/OMPlot/configure.ac b/OMPlot/configure.ac
@@ -12,7 +12,7 @@ AC_SUBST(host_short)
 
 m4_include([common/m4/ombuilddir.m4])
 m4_include([common/m4/pre-commit.m4])
-m4_include([common/m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([common/m4/ax_cxx_compile_stdcxx.m4])
 cp common/install-sh common/config.guess common/config.sub ./
 
 AC_CANONICAL_BUILD
@@ -26,7 +26,7 @@ test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
 AC_LANG([C++])
 AC_PROG_CC
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
+AX_CXX_COMPILE_STDCXX(14,[noext],[mandatory])
 
 host_short=$host_cpu-$host_os
 

diff --git a/OMPlot/qwt/Makefile.unix.in b/OMPlot/qwt/Makefile.unix.in
@@ -14,7 +14,7 @@ all: build
 
 Makefile: qwt.pro
 	@rm -f $@
-	$(QMAKE) QMAKE_CXX=@CXX@ QMAKE_CXXFLAGS="@CXXFLAGS@" QMAKE_LINK="@CXX@" qwt.pro
+	$(QMAKE) QMAKE_CXX="@CXX@" QMAKE_CXXFLAGS="@CXXFLAGS@" QMAKE_LINK="@CXX@" qwt.pro
 clean:
 	test ! -f Makefile || $(MAKE) -f Makefile clean
 	rm -rf build lib Makefile

diff --git a/OMShell/configure.ac b/OMShell/configure.ac
@@ -13,7 +13,7 @@ AC_SUBST(host_short)
 m4_include([common/m4/pre-commit.m4])
 cp common/install-sh common/config.guess common/config.sub ./
 m4_include([common/m4/ombuilddir.m4])
-m4_include([common/m4/ax_cxx_compile_stdcxx_11.m4])
+m4_include([common/m4/ax_cxx_compile_stdcxx.m4])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -24,7 +24,7 @@ test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
 AC_LANG([C++])
 AC_PROG_CXX
 AC_PROG_CC
-AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
+AX_CXX_COMPILE_STDCXX(14,[noext],[mandatory])
 
 host_short=$host_cpu-$host_os