build metis: intsize option

scivision · Dec 2, 2022 · d293dfd · d293dfd
1 parent ad6a37e
commit d293dfd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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=$<IF:$<BOOL:${intsize64}>,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
@@ -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
@@ -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
 )