diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e761b1d5f..e713095e0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -17,6 +17,7 @@ jobs: os: - macos-12 - macos-13 + - macos-14 build_type: [Release, Debug] lib: [shared, static] components: [minimal, lgpl, gpl] diff --git a/CMakeLists.txt b/CMakeLists.txt index 675028903..a1da6ffcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # # CMake support layer for SuiteSparse # -# Copyright 2023 Sergiu Deitsch +# Copyright 2024 Sergiu Deitsch # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # limitations under the License. # -cmake_minimum_required (VERSION 3.22) +cmake_minimum_required (VERSION 3.22...3.30) if (NOT DEFINED CMAKE_CUDA_ARCHITECTURES) set (CMAKE_CUDA_ARCHITECTURES 75) diff --git a/CXSparse/CMakeLists.txt b/CXSparse/CMakeLists.txt index 84198b626..04ea01016 100644 --- a/CXSparse/CMakeLists.txt +++ b/CXSparse/CMakeLists.txt @@ -1,7 +1,7 @@ # # CMake support layer for SuiteSparse # -# Copyright 2016-2021 Sergiu Deitsch +# Copyright 2024 Sergiu Deitsch # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ # limitations under the License. # -cmake_minimum_required (VERSION 3.12) +cmake_minimum_required (VERSION 3.12...3.30) project (cxsparse LANGUAGES C VERSION 3.2.0 DESCRIPTION "A Concise Sparse matrix package - Extended" HOMEPAGE_URL http://faculty.cse.tamu.edu/davis/suitesparse.html @@ -221,7 +221,7 @@ target_include_directories (cxsparse PUBLIC ) if (HAVE_M) - target_link_libraries (cxsparse PRIVATE m) + target_link_libraries (cxsparse PUBLIC m) endif (HAVE_M) if (NOT HAVE_C99_COMPLEX STREQUAL "") @@ -282,13 +282,11 @@ add_executable (cs_ci_demo2 $ Demo/cs_ci_demo2.c ) -target_link_libraries (cs_ci_demo2 PRIVATE cxsparse $<$:m>) add_executable (cs_ci_demo3 $ Demo/cs_ci_demo3.c ) -target_link_libraries (cs_ci_demo3 PRIVATE cxsparse $<$:m>) add_executable (cs_cl_demo1 Demo/cs_cl_demo1.c @@ -306,13 +304,11 @@ add_executable (cs_cl_demo2 $ Demo/cs_cl_demo2.c ) -target_link_libraries (cs_cl_demo2 PRIVATE cxsparse $<$:m>) add_executable (cs_cl_demo3 $ Demo/cs_cl_demo3.c ) -target_link_libraries (cs_cl_demo3 PRIVATE cxsparse $<$:m>) add_executable (cs_di_demo1 Demo/cs_di_demo1.c