From d293dfd680523d4d9b72c22df8fc5eddfd846703 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Thu, 1 Dec 2022 20:50:42 -0500 Subject: [PATCH] build metis: intsize option --- CMakeLists.txt | 2 +- cmake/libraries.json | 2 +- scripts/CMakeLists.txt | 5 +++-- scripts/build_metis.cmake | 8 ++++++-- scripts/build_scotch.cmake | 8 ++++++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84cc74f..e834ed5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ endif() project(MUMPS LANGUAGES C Fortran -VERSION 5.5.1.8 +VERSION 5.5.1.9 DESCRIPTION "Sparse direct parallel solver" HOMEPAGE_URL "http://mumps-solver.org/" ) diff --git a/cmake/libraries.json b/cmake/libraries.json index 948e1b7..5de350c 100644 --- a/cmake/libraries.json +++ b/cmake/libraries.json @@ -9,7 +9,7 @@ }, "metis": { "git": "https://github.com/scivision/METIS.git", - "tag": "v5.1.0.2" + "tag": "v5.1.0.3" }, "scotch": { "git": "https://gitlab.inria.fr/scotch/scotch.git", diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 381b775..5779468 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -69,8 +69,9 @@ CONFIGURE_HANDLED_BY_BUILD true # METIS -set(metis_cmake_args ${cmake_args}) -# METIS doesn't use INTSIZE64 like Scotch +set(metis_cmake_args ${cmake_args} +-Dintsize=$,64,32> +) string(JSON metis_url GET ${json} metis git) string(JSON metis_tag GET ${json} metis tag) diff --git a/scripts/build_metis.cmake b/scripts/build_metis.cmake index e2a93f8..398f1c9 100644 --- a/scripts/build_metis.cmake +++ b/scripts/build_metis.cmake @@ -19,10 +19,14 @@ if(NOT bindir) endif() endif() -execute_process(COMMAND ${CMAKE_COMMAND} ${args} +set(args -Dintsize64:BOOL=${intsize64}) +if(prefix) + list(APPEND args -DCMAKE_INSTALL_PREFIX:PATH=${prefix}) +endif() +execute_process(COMMAND ${CMAKE_COMMAND} -B${bindir} -S${CMAKE_CURRENT_LIST_DIR} --DCMAKE_INSTALL_PREFIX:PATH=${prefix} +${args} RESULT_VARIABLE ret ) diff --git a/scripts/build_scotch.cmake b/scripts/build_scotch.cmake index d6b77a2..92d7ea1 100644 --- a/scripts/build_scotch.cmake +++ b/scripts/build_scotch.cmake @@ -19,10 +19,14 @@ if(NOT bindir) endif() endif() -execute_process(COMMAND ${CMAKE_COMMAND} ${args} +set(args -Dintsize64:BOOL=${intsize64}) +if(prefix) + list(APPEND args -DCMAKE_INSTALL_PREFIX:PATH=${prefix}) +endif() +execute_process(COMMAND ${CMAKE_COMMAND} -B${bindir} -S${CMAKE_CURRENT_LIST_DIR} --DCMAKE_INSTALL_PREFIX:PATH=${prefix} +${args} RESULT_VARIABLE ret )