Skip to content

Commit

Permalink
Compile OMPlot with C++11
Browse files Browse the repository at this point in the history
C++11 is required in Qt 5.7
  • Loading branch information
sjoelund committed Oct 18, 2016
1 parent 1e06cf2 commit f907e83
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion OMPlot/OMPlotGUI/OMPlotGUI.config.in
Expand Up @@ -6,5 +6,5 @@ LIBS += -L @OMBUILDDIR@/lib/@host_short@/omc -lomqwt @RPATH_QMAKE@
INCLUDEPATH += @OPENMODELICAHOME@/include/omplot/qwt @OPENMODELICAHOME@/include/omc/c

QMAKE_CFLAGS = @CFLAGS@ @CPPFLAGS@
QMAKE_CXXFLAGS = @CFLAGS@ @CPPFLAGS@
QMAKE_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
QMAKE_LFLAGS += @LDFLAGS@
3 changes: 3 additions & 0 deletions configure.ac
Expand Up @@ -12,6 +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])
cp common/install-sh common/config.guess common/config.sub ./

AC_CANONICAL_BUILD
Expand All @@ -21,9 +22,11 @@ AC_CANONICAL_TARGET
rm install-sh

dnl Checks for programs.
test -z "$CXXFLAGS" && CXXFLAGS="$CFLAGS"
AC_LANG([C++])
AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])

host_short=$host_cpu-$host_os

Expand Down
2 changes: 1 addition & 1 deletion qwt/Makefile.unix.in
Expand Up @@ -14,7 +14,7 @@ all: build

Makefile: qwt.pro
@rm -f $@
$(QMAKE) QMAKE_CXX=@CXX@ qwt.pro
$(QMAKE) QMAKE_CXX=@CXX@ QMAKE_CXXFLAGS="@CXXFLAGS@" qwt.pro
clean:
test ! -f Makefile || $(MAKE) -f Makefile clean
rm -rf build lib Makefile
Expand Down

0 comments on commit f907e83

Please sign in to comment.