Date: Mon, 3 Sep 2018 07:35:04 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478847 - head/science/fleur/files Message-ID: <201809030735.w837Z47r056488@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Mon Sep 3 07:35:04 2018 New Revision: 478847 URL: https://svnweb.freebsd.org/changeset/ports/478847 Log: science/fleur: Add the forgotten patches. Added: head/science/fleur/files/ head/science/fleur/files/patch-cmake_tests_test__ELPA.cmake (contents, props changed) head/science/fleur/files/patch-cmake_tests_test__HDF5.cmake (contents, props changed) head/science/fleur/files/patch-cmake_tests_test__MPI.cmake (contents, props changed) head/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake (contents, props changed) head/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake (contents, props changed) Added: head/science/fleur/files/patch-cmake_tests_test__ELPA.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/fleur/files/patch-cmake_tests_test__ELPA.cmake Mon Sep 3 07:35:04 2018 (r478847) @@ -0,0 +1,18 @@ +--- cmake/tests/test_ELPA.cmake.orig 2018-07-03 14:37:33 UTC ++++ cmake/tests/test_ELPA.cmake +@@ -1,6 +1,6 @@ + #First check if we can compile with ELPA + try_compile(FLEUR_USE_ELPA ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_ELPA.f90 +-LINK_LIBRARIES ${FLEUR_LIBRARIES}) ++LINK_LIBRARIES ${FLEUR_LIBRARIES} -lelpa) + + if (NOT FLEUR_USE_ELPA) + set(STORE_FLAGS "${CMAKE_Fortran_FLAGS}") +@@ -63,3 +63,7 @@ LINK_LIBRARIES ${FLEUR_LIBRARIES}) + set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2" "CPP_ELPA_201705003") + endif() + endif() ++ ++if (FLEUR_USE_ELPA AND NOT ${FREEBSD_USE_ELPA}) ++ set(FLEUR_USE_ELPA OFF) ++endif() Added: head/science/fleur/files/patch-cmake_tests_test__HDF5.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/fleur/files/patch-cmake_tests_test__HDF5.cmake Mon Sep 3 07:35:04 2018 (r478847) @@ -0,0 +1,45 @@ +--- cmake/tests/test_HDF5.cmake.orig 2018-07-03 14:37:33 UTC ++++ cmake/tests/test_HDF5.cmake +@@ -1,6 +1,6 @@ + #first try if hdf already works + try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 +- LINK_LIBRARIES ${FLEUR_LIBRARIES} ++ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lhdf5 + ) + #now try to find the library using HDF5_ROOT variable + if (NOT FLEUR_USE_HDF5) +@@ -15,7 +15,7 @@ if (NOT FLEUR_USE_HDF5) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -I${HDF5_INCLUDE}") + endif() + try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 +- LINK_LIBRARIES ${TEST_LIBRARIES} ++ LINK_LIBRARIES ${TEST_LIBRARIES} -lhdf5 + ) + if (NOT FLEUR_USE_HDF5) + set(CMAKE_Fortran_FLAGS ${STORE_FLAGS}) +@@ -35,7 +35,7 @@ if (NOT FLEUR_USE_HDF5) + set(CMAKE_Fortran_FLAGS "-I${HDF5_INCLUDE_LIBRARIES}" ${CMAKE_Fortran_FLAGS}) + + try_compile(FLEUR_USE_HDF5 ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5.f90 +- LINK_LIBRARIES ${TEST_LIBRARIES} ++ LINK_LIBRARIES ${TEST_LIBRARIES} -lhdf5 + ) + if (${FLEUR_USE_HDF5}) + set(FLEUR_LIBRARIES ${HDF5_Fortran_LIBRARIES} ${FLEUR_LIBRARIES}) +@@ -49,14 +49,14 @@ endif() + #check if HDF is parallel + if ( FLEUR_USE_HDF5) + try_compile(FLEUR_USE_HDF5MPI ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_HDF5MPI.f90 +- LINK_LIBRARIES ${FLEUR_LIBRARIES} ++ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lhdf5 + ) + endif() + + message("HDF5 Library found:${FLEUR_USE_HDF5}") + + if (DEFINED ENV{FLEUR_USE_HDF5}) +- if (ENV{FLEUR_USE_HDF5}) ++ if ($ENV{FLEUR_USE_HDF5}) + if (NOT FLEUR_USE_HDF5) + message(FATAL_ERROR "You asked for HDF5 but cmake couldn't find it. Please set HDF5_ROOT and or give additional compiler/linker flags") + endif() Added: head/science/fleur/files/patch-cmake_tests_test__MPI.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/fleur/files/patch-cmake_tests_test__MPI.cmake Mon Sep 3 07:35:04 2018 (r478847) @@ -0,0 +1,17 @@ +--- cmake/tests/test_MPI.cmake.orig 2018-07-03 14:37:33 UTC ++++ cmake/tests/test_MPI.cmake +@@ -1,12 +1,12 @@ + #Check if we can compile with MPI + try_compile(FLEUR_USE_MPI ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_MPI.f90 +-LINK_LIBRARIES ${FLEUR_LIBRARIES} ++LINK_LIBRARIES ${FLEUR_LIBRARIES} -lmpich + ) + + message("MPI Library found:${FLEUR_USE_MPI}") + + if (DEFINED ENV{FLEUR_USE_MPI}) +- if (ENV{FLEUR_USE_MPI}) ++ if ($ENV{FLEUR_USE_MPI}) + if (NOT FLEUR_USE_MPI) + message(FATAL_ERROR "You asked for MPI but cmake couldn't find it. Please check your Fortran compiler settings") + endif() Added: head/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/fleur/files/patch-cmake_tests_test__SCALAPACK.cmake Mon Sep 3 07:35:04 2018 (r478847) @@ -0,0 +1,19 @@ +--- cmake/tests/test_SCALAPACK.cmake.orig 2018-07-03 14:37:33 UTC ++++ cmake/tests/test_SCALAPACK.cmake +@@ -1,9 +1,13 @@ + #First check if we can compile with LAPACK + try_compile(FLEUR_USE_SCALAPACK ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_SCALAPACK.f90 +-LINK_LIBRARIES ${FLEUR_LIBRARIES} ++LINK_LIBRARIES ${FLEUR_LIBRARIES} -lscalapack + ) + + message("SCALAPACK Library found:${FLEUR_USE_SCALAPACK}") + if (FLEUR_USE_SCALAPACK) + set(FLEUR_MPI_DEFINITIONS ${FLEUR_MPI_DEFINITIONS} "CPP_SCALAPACK") +-endif() +\ No newline at end of file ++endif() ++ ++if (FLEUR_USE_SCALAPACK AND NOT ${FREEBSD_USE_SCALAPACK}) ++ set(FLEUR_USE_SCALAPACK OFF) ++endif() Added: head/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/fleur/files/patch-cmake_tests_test__Wannier90.cmake Mon Sep 3 07:35:04 2018 (r478847) @@ -0,0 +1,17 @@ +--- cmake/tests/test_Wannier90.cmake.orig 2018-07-03 14:37:33 UTC ++++ cmake/tests/test_Wannier90.cmake +@@ -1,12 +1,12 @@ + #first try if Wannier90 already works + try_compile(FLEUR_USE_WANN ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_Wannier90.f90 +- LINK_LIBRARIES ${FLEUR_LIBRARIES} ++ LINK_LIBRARIES ${FLEUR_LIBRARIES} -lwannier + ) + + message("Wannier90 1.2 Library found:${FLEUR_USE_WANN}") + + if (DEFINED ENV{FLEUR_USE_WANNIER}) +- if (ENV{FLEUR_USE_WANNIER}) ++ if ($ENV{FLEUR_USE_WANNIER}) + if (NOT FLEUR_USE_WANN) + message(FATAL_ERROR "You asked for Wannier90 but cmake couldn't find it. Please check your Fortran compiler settings") + endif()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809030735.w837Z47r056488>