C++11 (for ICB): do NOT use hard-coded gnu++11. (#133)

This commit is contained in:
Franck HOUSSEN
2018-06-25 21:38:48 +02:00
committed by Sylvestre Ledru
parent 2fede344e2
commit 277a6c8cfe
3 changed files with 8 additions and 5 deletions
+5 -2
View File
@@ -11,10 +11,13 @@ addons:
- gfortran
- gcc
- g++
- openmpi-bin
- libopenmpi-dev
- cmake
- automake
- autoconf
- libblas-dev
- liblapack-dev
- libopenmpi-dev
- openmpi-bin
env:
- BUILD=cmake
+1 -1
View File
@@ -63,7 +63,7 @@ endfunction(pexamples)
if (ICB)
enable_language(C CXX) # For testing binding with c/c++.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
set(CMAKE_CXX_STANDARD 11) # OK, since cmake-3.1 only.
file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/PROG_ICB.f90
"
+2 -2
View File
@@ -138,7 +138,6 @@ if test x"$enable_icb" != x"no"; then
AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX(11, ext)
AM_CONDITIONAL([ICB], [true])
AC_CONFIG_FILES([arpack.h:arpack.h])
AC_CONFIG_FILES([arpack.hpp:arpack.hpp])
@@ -159,7 +158,7 @@ if test x"$enable_icb" != x"no"; then
AC_LANG_PUSH([C++])
AX_MPI([], AC_MSG_ERROR([could not compile a C++ MPI test program]))
AC_SUBST([MPI_CXX_LIBS], ["$MPILIBS $FCLIBS"])
CXX="$MPICXX -std=gnu++11"
CXX=$MPICXX
AC_LANG_POP([C++])
AC_LANG_PUSH([C])
@@ -179,6 +178,7 @@ if test x"$enable_icb" != x"no"; then
)
AC_LANG_POP([C])
fi
AX_CXX_COMPILE_STDCXX(11)
fi
dnl Add support for debuging arpack