Merge pull request #273 from DrTimothyAldenDavis/v9.0.0.branch

Makefile: "make static" revised to match recent cmake changes
DrTimothyAldenDavis · Feb 26, 2024 · cc3e1af · cc3e1af
2 parents a5b7d1e + 4be9bf4
commit cc3e1af
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/Doc/ChangeLog b/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Feb 26, 2024: version 9.0.2
+
+    * (51) bug fix: GraphBLAS/Makefile "make static" was incorrect.
+
 Jan 20, 2024: version 9.0.1
 
     * minor updates to build system

diff --git a/Doc/GraphBLAS_UserGuide.pdf b/Doc/GraphBLAS_UserGuide.pdf
diff --git a/Doc/GraphBLAS_UserGuide.tex b/Doc/GraphBLAS_UserGuide.tex
@@ -14768,6 +14768,12 @@ \section{Release Notes}
 
 \begin{itemize}
 
+\item Feb 26, 2024: version 9.0.2
+
+    \begin{itemize}
+    \item GraphBLAS/Makefile \verb"make static" was incorrect.
+    \end{itemize}
+
 \item Jan 20, 2024: version 9.0.1
 
     \begin{itemize}

diff --git a/Doc/GraphBLAS_version.tex b/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-9.0.1,
-Jan 20, 2024}
+9.0.2,
+Feb 26, 2024}
 
diff --git a/Include/GraphBLAS.h b/Include/GraphBLAS.h
@@ -1,4 +1,4 @@
-// SuiteSparse:GraphBLAS 9.0.1
+// SuiteSparse:GraphBLAS 9.0.2
 //------------------------------------------------------------------------------
 // GraphBLAS.h: definitions for the GraphBLAS package
 //------------------------------------------------------------------------------
@@ -226,10 +226,10 @@
 
 // The version of this implementation, and the GraphBLAS API version:
 #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
-#define GxB_IMPLEMENTATION_DATE "Jan 20, 2024"
+#define GxB_IMPLEMENTATION_DATE "Feb 26, 2024"
 #define GxB_IMPLEMENTATION_MAJOR 9
 #define GxB_IMPLEMENTATION_MINOR 0
-#define GxB_IMPLEMENTATION_SUB   1
+#define GxB_IMPLEMENTATION_SUB   2
 #define GxB_SPEC_DATE "Dec 22, 2023"
 #define GxB_SPEC_MAJOR 2
 #define GxB_SPEC_MINOR 1

diff --git a/Makefile b/Makefile
@@ -80,7 +80,7 @@ setup:
 
 # build the static library
 static:
-	( cd build && cmake $(CMAKE_OPTIONS) -DNSTATIC=0 .. && cmake --build . --config Release -j$(JOBS) )
+	( cd build && cmake $(CMAKE_OPTIONS) -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF .. && cmake --build . --config Release -j$(JOBS) )
 
 # installs GraphBLAS to the install location defined by cmake, usually
 # /usr/local/lib and /usr/local/include

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 
-VERSION 9.0.1, Jan 20, 2024
+VERSION 9.0.2, Feb 26, 2024
 
 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
 which defines a set of sparse matrix operations on an extended algebra of

diff --git a/cmake_modules/GraphBLAS_version.cmake b/cmake_modules/GraphBLAS_version.cmake
@@ -8,10 +8,10 @@
 #-------------------------------------------------------------------------------
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Jan 20, 2024" )
+set ( GraphBLAS_DATE "Feb 26, 2024" )
 set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
 set ( GraphBLAS_VERSION_MINOR 0 CACHE STRING "" FORCE )
-set ( GraphBLAS_VERSION_SUB   1 CACHE STRING "" FORCE )
+set ( GraphBLAS_VERSION_SUB   2 CACHE STRING "" FORCE )
 
 # GraphBLAS C API Specification version, at graphblas.org
 set ( GraphBLAS_API_DATE "Dec 22, 2023" )