Commit 24ffa347 authored by Andreas Beckmann's avatar Andreas Beckmann

C++ is needed for compiling *.cpp

parent 287b9c22
......@@ -7,7 +7,7 @@ endif()
# sometimes cmake clears CMAKE_Fortran_FLAGS during project()
set(CMAKE_Fortran_FLAGS_backup ${CMAKE_Fortran_FLAGS})
set(CMAKE_Fortran_FLAGS "")
project(FLEUR LANGUAGES C Fortran)
project(FLEUR LANGUAGES C CXX Fortran)
string(STRIP "${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_backup}" CMAKE_Fortran_FLAGS)
include("cmake/CompilerConfig.txt")
......
......@@ -2,7 +2,9 @@
then
export FC=mpif90
export CC=mpicc
export CXX=mpicxx
else
export FC=gfortran
export CC=gcc
export CXX=g++
fi
......@@ -34,6 +34,7 @@ then
export FC=${FC:=mpif90}
export CC=${CC:=mpicc}
export CXX=${CXX:=mpicxx}
#ELPA
CLI_ELPA_OPENMP=1
FLEUR_LIBDIR="$FLEUR_LIBDIR $ELPA_LIB"
......
......@@ -11,6 +11,7 @@ then
echo "PGI toolchain used"
FC=mpif90
CC=mpicc
CXX=mpicxx
FLEUR_INCLUDEDIR="$XML2_ROOT/include"
FLEUR_LIBRARIES="-lstdc++;-L$MKLROOT/lib/intel64;-lmkl_scalapack_lp64;-lmkl_intel_lp64;-lmkl_pgi_thread;-lmkl_core;-lmkl_blacs_intelmpi_lp64"
else
......
......@@ -15,6 +15,7 @@
then
export FC=mpif90
export CC=mpicc
export CXX=mpicxx
fi
fi
......
......@@ -3,6 +3,7 @@
then
export FC=mpif90
export CC=mpicc
export CXX=mpicxx
fi
if module list 2>&1 | grep -q elpa
......
......@@ -6,7 +6,7 @@ while [ $# -gt 0 ]
do
case "$1" in
-h) help=1;;
-help) help=1;;
-help|--help) help=1;;
-b) backup=1;;
-backup) backup=1;;
-g) gitupdate=1;;
......@@ -120,8 +120,9 @@ cmake/machines in this case :-)
In addition you can modify some environment variables:
FC -- name of Fortran compiler
CC -- name of C compiler"
echo "
CC -- name of C compiler
CXX -- name of C++ compiler
By specifying a label you can have different build directories.
The label will be added to the 'build' directory name."
exit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment