From 08adc760bbb31493b4c1afb52aa095620f75d33d Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 8 Nov 2021 16:45:33 -0500 Subject: [PATCH] don't override _external cache var --- PORD/lib/CMakeLists.txt | 4 +--- VERSION | 2 +- cmake/install.cmake | 3 ++- cmake/libraries.json | 4 ++-- cmake/mumps_patch.cmake | 20 ++++++++++---------- cmake/options.cmake | 3 --- libseq/CMakeLists.txt | 16 +++++++--------- src/CMakeLists.txt | 25 +++++++++++-------------- 8 files changed, 34 insertions(+), 43 deletions(-) diff --git a/PORD/lib/CMakeLists.txt b/PORD/lib/CMakeLists.txt index 95b3ad2..ba4c64b 100644 --- a/PORD/lib/CMakeLists.txt +++ b/PORD/lib/CMakeLists.txt @@ -1,9 +1,7 @@ add_library(pord graph.c gbipart.c gbisect.c ddcreate.c ddbisect.c nestdiss.c multisector.c gelim.c bucket.c tree.c symbfac.c interface.c sort.c minpriority.c ) -target_include_directories(pord -PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include -INTERFACE +target_include_directories(pord PUBLIC $ $ ) diff --git a/VERSION b/VERSION index a4e4cef..169ade2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.4.1.6 +5.4.1.7 diff --git a/cmake/install.cmake b/cmake/install.cmake index c7e75f5..0f3c97b 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -14,7 +14,8 @@ COMPATIBILITY SameMinorVersion install(EXPORT ${PROJECT_NAME}-targets NAMESPACE ${PROJECT_NAME}:: -DESTINATION cmake) +DESTINATION cmake +) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake diff --git a/cmake/libraries.json b/cmake/libraries.json index 70a953d..21b26bc 100644 --- a/cmake/libraries.json +++ b/cmake/libraries.json @@ -1,11 +1,11 @@ { "lapack": { "git": "https://github.com/scivision/lapack.git", - "tag": "v3.10.0.2" + "tag": "v3.10.0.3" }, "scalapack": { "git": "https://github.com/scivision/scalapack.git", - "tag": "v2.1.0.28" + "tag": "v2.1.0.29" }, "mumps": { diff --git a/cmake/mumps_patch.cmake b/cmake/mumps_patch.cmake index 6c6912a..2ffd600 100644 --- a/cmake/mumps_patch.cmake +++ b/cmake/mumps_patch.cmake @@ -11,29 +11,29 @@ if(WIN32) find_program(WSL NAMES wsl REQUIRED) execute_process(COMMAND ${WSL} wslpath ${mumps_orig} - TIMEOUT 15 - OUTPUT_VARIABLE mumps_orig_path - COMMAND_ERROR_IS_FATAL ANY - OUTPUT_STRIP_TRAILING_WHITESPACE + TIMEOUT 15 + OUTPUT_VARIABLE mumps_orig_path + COMMAND_ERROR_IS_FATAL ANY + OUTPUT_STRIP_TRAILING_WHITESPACE ) execute_process(COMMAND ${WSL} wslpath ${mumps_patch} - TIMEOUT 15 - OUTPUT_VARIABLE mumps_patch_path - COMMAND_ERROR_IS_FATAL ANY - OUTPUT_STRIP_TRAILING_WHITESPACE + TIMEOUT 15 + OUTPUT_VARIABLE mumps_patch_path + COMMAND_ERROR_IS_FATAL ANY + OUTPUT_STRIP_TRAILING_WHITESPACE ) # we don't check for error as in case build got interrupted before mumps_patch # cache set but after patch applied. # the patch commmand would error on next build due to already applied patch. # we didn't want to apply --force option as that's too aggressive. execute_process(COMMAND ${WSL} patch --batch --forward ${mumps_orig_path} --input=${mumps_patch_path} - TIMEOUT 15 + TIMEOUT 15 ) else() find_program(PATCH NAMES patch REQUIRED) execute_process(COMMAND ${PATCH} --batch --forward ${mumps_orig} --input=${mumps_patch} - TIMEOUT 15 + TIMEOUT 15 ) endif() diff --git a/cmake/options.cmake b/cmake/options.cmake index 4b0f286..213b2e8 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -1,7 +1,4 @@ option(autobuild "auto-build Lapack and/or Scalapack if missing or broken" true) -option(lapack_external "build Lapack instead of finding") -option(scalapack_external "build ScaLapack instead of finding") -option(mumps_external "build MUMPS instead of finding") option(dev "developer mode") option(parallel "parallel or sequential (non-MPI, non-Scalapack)" ON) diff --git a/libseq/CMakeLists.txt b/libseq/CMakeLists.txt index 3423446..ffdb1b0 100644 --- a/libseq/CMakeLists.txt +++ b/libseq/CMakeLists.txt @@ -1,14 +1,12 @@ add_library(mpiseq elapse.c mpi.f mpic.c) -target_include_directories(mpiseq - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include - INTERFACE - $ - $ - $ - ) +target_include_directories(mpiseq PUBLIC +"$" +$ +) set_target_properties(mpiseq PROPERTIES - Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include - EXPORT_NAME MPISEQ) +Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include +EXPORT_NAME MPISEQ +) # target for FetchContent # this must NOT be an ALIAS or linking in other packages breaks. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f110b9..27036b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,10 +42,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include) add_library(mumps_common ${COMM_SRC} ${COMM_OTHER_SRC}) target_link_libraries(mumps_common PRIVATE ${ORDERING_LIBS} ${NUMERIC_LIBS}) -target_include_directories(mumps_common -PRIVATE ${mumps_SOURCE_DIR}/include -INTERFACE -$ +target_include_directories(mumps_common PUBLIC $ $ ) @@ -118,21 +115,21 @@ target_compile_definitions(${a}mumps PRIVATE MUMPS_ARITH=MUMPS_ARITH_${a} ${ORDE # if(WIN32) # target_compile_definitions(${a}mumps PRIVATE MUMPS_WIN32) # endif() -target_include_directories(${a}mumps PRIVATE ${mumps_SOURCE_DIR}/include - INTERFACE - $ - $ - $) +target_include_directories(${a}mumps PUBLIC +$ +$ +) target_link_libraries(${a}mumps PRIVATE mumps_common ${ORDERING_LIBS} ${NUMERIC_LIBS}) string(TOUPPER ${a} aup) set_target_properties(${a}mumps PROPERTIES - Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include - LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} - ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} - EXPORT_NAME ${aup}MUMPS - VERSION ${MUMPS_VERSION}) +Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include +LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} +ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR} +EXPORT_NAME ${aup}MUMPS +VERSION ${MUMPS_VERSION} +) install(TARGETS ${a}mumps EXPORT ${PROJECT_NAME}-targets)