Commit c56d35a9 authored by Daniel Wortmann's avatar Daniel Wortmann

Bugfix in configure script

parent b0f81fde
...@@ -6,7 +6,7 @@ endif() ...@@ -6,7 +6,7 @@ endif()
set(tmp ${CMAKE_Fortran_FLAGS}) set(tmp ${CMAKE_Fortran_FLAGS})
project(FLEUR LANGUAGES C Fortran) project(FLEUR LANGUAGES C Fortran)
set(CMAKE_Fortran_FLAGS ${CMAKE_Fortran_FLAGS} ${tmp}) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${tmp}")
include("cmake/CompilerConfig.txt") include("cmake/CompilerConfig.txt")
......
...@@ -2,7 +2,7 @@ set(FLEUR_DEFINITIONS ${FLEUR_DEFINITIONS} "CPP_DOUBLE") ...@@ -2,7 +2,7 @@ set(FLEUR_DEFINITIONS ${FLEUR_DEFINITIONS} "CPP_DOUBLE")
set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_DOUBLE") set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_DOUBLE")
include("cmake/tests/test_doxygen.cmake") include("cmake/tests/test_doxygen.cmake")
message("${CMAKE_Fortran_FLAGS}")
include("cmake/compilerflags.cmake") include("cmake/compilerflags.cmake")
include("cmake/tests/test_XML.cmake") include("cmake/tests/test_XML.cmake")
include("cmake/tests/test_LAPACK.cmake") include("cmake/tests/test_LAPACK.cmake")
...@@ -15,10 +15,12 @@ include("cmake/tests/test_Wannier5.cmake") ...@@ -15,10 +15,12 @@ include("cmake/tests/test_Wannier5.cmake")
include("cmake/tests/test_MAGMA.cmake") include("cmake/tests/test_MAGMA.cmake")
include("cmake/tests/test_GPU.cmake") include("cmake/tests/test_GPU.cmake")
include("cmake/tests/test_LibXC.cmake") include("cmake/tests/test_LibXC.cmake")
message("${CMAKE_Fortran_FLAGS}")
if (FLEUR_USE_MPI) if (FLEUR_USE_MPI)
include("cmake/tests/test_SCALAPACK.cmake") include("cmake/tests/test_SCALAPACK.cmake")
include("cmake/tests/test_ELPA.cmake") include("cmake/tests/test_ELPA.cmake")
include("cmake/tests/test_ChASE.cmake") include("cmake/tests/test_ChASE.cmake")
endif() endif()
message("${CMAKE_Fortran_FLAGS}")
include("cmake/compileenv.txt") include("cmake/compileenv.txt")
if module list 2>&1 |grep -q -i intel if module list 2>&1 |grep -q -i intel
then then
echo "Intel toolchain used" echo "Intel toolchain used"
module load CMake
export FC=${FC:=mpif90} export FC=${FC:=mpif90}
export CC=${CC:=mpicc} export CC=${CC:=mpicc}
#determine XML2 module #determine XML2 module
...@@ -20,7 +21,7 @@ then ...@@ -20,7 +21,7 @@ then
FLEUR_LIBRARIES="-lelpa_openmp;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64" FLEUR_LIBRARIES="-lelpa_openmp;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64"
ml
elif module list 2>&1 |grep -q PGI elif module list 2>&1 |grep -q PGI
then then
echo "PGI toolchain used" echo "PGI toolchain used"
......
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