diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a8fffd8b0dde93759b39c105e04bc72be8dd08..b2a4b9d45a08b3621e305fff6e9d06cb5e138fa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ endif() set(tmp ${CMAKE_Fortran_FLAGS}) 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") diff --git a/cmake/CompilerConfig.txt b/cmake/CompilerConfig.txt index 7e4ef3c82a82d89d483670902319b299c74aceb0..b1dd230fa215f181c414610243ec36947550239b 100644 --- a/cmake/CompilerConfig.txt +++ b/cmake/CompilerConfig.txt @@ -2,7 +2,7 @@ set(FLEUR_DEFINITIONS ${FLEUR_DEFINITIONS} "CPP_DOUBLE") set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_DOUBLE") include("cmake/tests/test_doxygen.cmake") - +message("${CMAKE_Fortran_FLAGS}") include("cmake/compilerflags.cmake") include("cmake/tests/test_XML.cmake") include("cmake/tests/test_LAPACK.cmake") @@ -15,10 +15,12 @@ include("cmake/tests/test_Wannier5.cmake") include("cmake/tests/test_MAGMA.cmake") include("cmake/tests/test_GPU.cmake") include("cmake/tests/test_LibXC.cmake") +message("${CMAKE_Fortran_FLAGS}") if (FLEUR_USE_MPI) include("cmake/tests/test_SCALAPACK.cmake") include("cmake/tests/test_ELPA.cmake") include("cmake/tests/test_ChASE.cmake") endif() +message("${CMAKE_Fortran_FLAGS}") include("cmake/compileenv.txt") diff --git a/cmake/machines/JURECA.sh b/cmake/machines/JURECA.sh index 5aad5fc3cef269fc2201963bc81193582d5d5c42..defde78520227693afdd2c9fee6a3f8a28a25996 100644 --- a/cmake/machines/JURECA.sh +++ b/cmake/machines/JURECA.sh @@ -1,6 +1,7 @@ if module list 2>&1 |grep -q -i intel then echo "Intel toolchain used" + module load CMake export FC=${FC:=mpif90} export CC=${CC:=mpicc} #determine XML2 module @@ -20,7 +21,7 @@ then FLEUR_LIBRARIES="-lelpa_openmp;-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64" - + ml elif module list 2>&1 |grep -q PGI then echo "PGI toolchain used"