Skip to content

Commit 3d1a1b0

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
2 parents aaa3a74 + 44097ad commit 3d1a1b0

38 files changed

+119
-103
lines changed

‎CCOLAMD/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
cmake_minimum_required ( VERSION 3.22 )
1313

14-
set ( CCOLAMD_DATE "Jan 10, 2024" )
14+
set ( CCOLAMD_DATE "Jan 20, 2024" )
1515
set ( CCOLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
1616
set ( CCOLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
17-
set ( CCOLAMD_VERSION_SUB 1 CACHE STRING "" FORCE )
17+
set ( CCOLAMD_VERSION_SUB 2 CACHE STRING "" FORCE )
1818

1919
message ( STATUS "Building CCOLAMD version: v"
2020
${CCOLAMD_VERSION_MAJOR}.
@@ -43,10 +43,10 @@ include ( SuiteSparsePolicy )
4343
#-------------------------------------------------------------------------------
4444

4545
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
46-
find_package ( SuiteSparse_config 7.5.0
46+
find_package ( SuiteSparse_config 7.6.0
4747
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
4848
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
49-
find_package ( SuiteSparse_config 7.5.0 REQUIRED )
49+
find_package ( SuiteSparse_config 7.6.0 REQUIRED )
5050
endif ( )
5151
endif ( )
5252

‎CCOLAMD/Config/ccolamd.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747
#define CCOLAMD__VERSION SUITESPARSE__VERCODE(@CCOLAMD_VERSION_MAJOR@,@CCOLAMD_VERSION_MINOR@,@CCOLAMD_VERSION_SUB@)
4848
#if !defined (SUITESPARSE__VERSION) || \
49-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
50-
#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later"
49+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
50+
#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later"
5151
#endif
5252

5353
/* ========================================================================== */

‎CCOLAMD/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Jan 20, 2024: version 3.3.2
2+
3+
* minor updates to build system
4+
15
Jan 10, 2024: version 3.3.1
26

37
* minor updates to build system

‎CCOLAMD/Include/ccolamd.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@
3636
* #endif
3737
*/
3838

39-
#define CCOLAMD_DATE "Jan 10, 2024"
39+
#define CCOLAMD_DATE "Jan 20, 2024"
4040
#define CCOLAMD_MAIN_VERSION 3
4141
#define CCOLAMD_SUB_VERSION 3
42-
#define CCOLAMD_SUBSUB_VERSION 1
42+
#define CCOLAMD_SUBSUB_VERSION 2
4343

4444
#define CCOLAMD_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
4545
#define CCOLAMD_VERSION CCOLAMD_VERSION_CODE(3,3)
4646

47-
#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,1)
47+
#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,2)
4848
#if !defined (SUITESPARSE__VERSION) || \
49-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
50-
#error "CCOLAMD 3.3.1 requires SuiteSparse_config 7.5.0 or later"
49+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
50+
#error "CCOLAMD 3.3.2 requires SuiteSparse_config 7.6.0 or later"
5151
#endif
5252

5353
/* ========================================================================== */

‎CCOLAMD/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ remake:
6464

6565
# just run cmake to set things up
6666
setup:
67-
( cd build ; cmake $(CMAKE_OPTIONS) .. )
67+
( cd build && cmake $(CMAKE_OPTIONS) .. )
6868

6969
install:
7070
( cd build && cmake --install . )

‎CHOLMOD/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
124124
find_package ( AMD 3.3.1 REQUIRED )
125125
endif ( )
126126

127-
find_package ( COLAMD 3.3.1
127+
find_package ( COLAMD 3.3.2
128128
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
129129
if ( NOT TARGET SuiteSparse::COLAMD )
130-
find_package ( COLAMD 3.3.1 REQUIRED )
130+
find_package ( COLAMD 3.3.2 REQUIRED )
131131
endif ( )
132132
endif ( )
133133

@@ -237,10 +237,10 @@ endif ( )
237237
find_package ( CAMD 3.3.1 )
238238
endif ( )
239239

240-
find_package ( CCOLAMD 3.3.1
240+
find_package ( CCOLAMD 3.3.2
241241
PATHS ${CMAKE_SOURCE_DIR}/../CCOLAMD/build NO_DEFAULT_PATH )
242242
if ( NOT TARGET SuiteSparse::CCOLAMD )
243-
find_package ( CCOLAMD 3.3.1 )
243+
find_package ( CCOLAMD 3.3.2 )
244244
endif ( )
245245

246246
if ( NOT CAMD_FOUND OR NOT CCOLAMD_FOUND )

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ endif ( )
170170

171171
if ( SUITESPARSE_USE_SYSTEM_COLAMD )
172172
list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "colamd" )
173-
find_package ( COLAMD 3.3.1 REQUIRED )
173+
find_package ( COLAMD 3.3.2 REQUIRED )
174174
else ( )
175175
if ( "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS
176176
OR "spex" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
@@ -197,7 +197,7 @@ endif ( )
197197

198198
if ( SUITESPARSE_USE_SYSTEM_CCOLAMD )
199199
list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "ccolamd" )
200-
find_package ( CCOLAMD 3.3.1 REQUIRED )
200+
find_package ( CCOLAMD 3.3.2 REQUIRED )
201201
else ( )
202202
if ( CHOLMOD_CAMD AND "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
203203
# CHOLMOD can optionally use CCOLAMD.

‎COLAMD/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
cmake_minimum_required ( VERSION 3.22 )
1313

14-
set ( COLAMD_DATE "Jan 10, 2024" )
14+
set ( COLAMD_DATE "Jan 20, 2024" )
1515
set ( COLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
1616
set ( COLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
17-
set ( COLAMD_VERSION_SUB 1 CACHE STRING "" FORCE )
17+
set ( COLAMD_VERSION_SUB 2 CACHE STRING "" FORCE )
1818

1919
message ( STATUS "Building COLAMD version: v"
2020
${COLAMD_VERSION_MAJOR}.
@@ -43,10 +43,10 @@ include ( SuiteSparsePolicy )
4343
#-------------------------------------------------------------------------------
4444

4545
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
46-
find_package ( SuiteSparse_config 7.5.0
46+
find_package ( SuiteSparse_config 7.6.0
4747
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
4848
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
49-
find_package ( SuiteSparse_config 7.5.0 REQUIRED )
49+
find_package ( SuiteSparse_config 7.6.0 REQUIRED )
5050
endif ( )
5151
endif ( )
5252

‎COLAMD/Config/colamd.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575

7676
#define COLAMD__VERSION SUITESPARSE__VERCODE(@COLAMD_VERSION_MAJOR@,@COLAMD_VERSION_MINOR@,@COLAMD_VERSION_SUB@)
7777
#if !defined (SUITESPARSE__VERSION) || \
78-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
79-
#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later"
78+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
79+
#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later"
8080
#endif
8181

8282
/* ========================================================================== */

‎COLAMD/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Jan 20, 2024: version 3.3.2
2+
3+
* minor updates to build system
4+
15
Jan 10, 2024: version 3.3.1
26

37
* minor updates to build system

0 commit comments

Comments
 (0)