Compile OMNotebook with C++11, ticket:3990

- C++11 is required in Qt 5.7
OpenModelica · Nov 7, 2016 · 87a6e8b · 87a6e8b
1 parent cb438f2
commit 87a6e8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/OMNotebook/OMNotebookGUI/OMNotebook.config.in b/OMNotebook/OMNotebookGUI/OMNotebook.config.in
@@ -8,7 +8,7 @@ OMCLIBS = -L@OPENMODELICAHOME@/lib/@host_short@/omc -lOpenModelicaCompiler -lOpe
 OMCINC = @OPENMODELICAHOME@/include/omc/c
 
 QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
-QMAKE_CXXFLAGS = @CFLAGS@ @CPPFLAGS@
+QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
 QMAKE_LFLAGS += @LDFLAGS@
 
 # 64MB (0x4000000)

diff --git a/configure.ac b/configure.ac
@@ -12,15 +12,18 @@ 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])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 dnl Checks for programs.
 AC_LANG([C++])
+test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
 AC_PROG_CC
 AC_PROG_CXX
+AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
 
 host_short=$host_cpu-$host_os