Skip to content

Commit

Permalink
KLU 2.3.0: version update
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTimothyAldenDavis committed Nov 28, 2023
1 parent bf10d8b commit 29d8d22
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 197 deletions.
26 changes: 13 additions & 13 deletions KLU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

cmake_minimum_required ( VERSION 3.20 )

set ( KLU_DATE "Oct 23, 2023" )
set ( KLU_DATE "Dec 30, 2023" )
set ( KLU_VERSION_MAJOR 2 CACHE STRING "" FORCE )
set ( KLU_VERSION_MINOR 2 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 2 CACHE STRING "" FORCE )
set ( KLU_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 0 CACHE STRING "" FORCE )

message ( STATUS "Building KLU version: v"
${KLU_VERSION_MAJOR}.
Expand Down Expand Up @@ -50,39 +50,39 @@ endif ( )
#-------------------------------------------------------------------------------

if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
find_package ( SuiteSparse_config 7.3.0
find_package ( SuiteSparse_config 7.4.0
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
find_package ( SuiteSparse_config 7.3.0 REQUIRED )
find_package ( SuiteSparse_config 7.4.0 REQUIRED )
endif ( )

find_package ( AMD 3.2.1
find_package ( AMD 3.3.0
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::AMD )
find_package ( AMD 3.2.1 REQUIRED )
find_package ( AMD 3.3.0 REQUIRED )
endif ( )

find_package ( COLAMD 3.2.1
find_package ( COLAMD 3.3.0
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::COLAMD )
find_package ( COLAMD 3.2.1 REQUIRED )
find_package ( COLAMD 3.3.0 REQUIRED )
endif ( )

find_package ( BTF 2.2.1
find_package ( BTF 2.3.0
PATHS ${CMAKE_SOURCE_DIR}/../BTF/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::BTF )
find_package ( BTF 2.2.1 REQUIRED )
find_package ( BTF 2.3.0 REQUIRED )
endif ( )
endif ( )

option ( NCHOLMOD "ON: do not use CHOLMOD. OFF (default): use CHOLMOD" OFF )

if ( NOT SUITESPARSE_ROOT_CMAKELISTS AND NOT NCHOLMOD )
# look for CHOLMOD (optional fill-reducing orderings)
find_package ( CHOLMOD 5.0.0
find_package ( CHOLMOD 5.1.0
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::CHOLMOD )
find_package ( CHOLMOD 5.0.0 )
find_package ( CHOLMOD 5.1.0 )
endif ( )

if ( NOT CHOLMOD_FOUND )
Expand Down
Loading

0 comments on commit 29d8d22

Please sign in to comment.