macOS CI update

.github/workflows/build-macos.yml

@@ -5,7 +5,7 @@ on: [push, workflow_dispatch]
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-15
 
     steps:
     - name: Checkout

.github/workflows/build-ubuntu.yml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout

CMakeLists.txt

@@ -1,5 +1,5 @@
 # package config
-cmake_minimum_required(VERSION 3.11.0)
+cmake_minimum_required(VERSION 3.24.0)
 project(
   LatAnalyze
   VERSION 3.6
@@ -41,18 +41,17 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 
 # fetch and create symbolic link to Eigen headers
-set(FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/deps)
+set(EIGEN_URL "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz")
-FetchContent_Declare(
+set(EIGEN_TGZ "${CMAKE_BINARY_DIR}/eigen-3.4.0.tar.gz")
-  Eigen3
+set(EIGEN_DIR "${CMAKE_BINARY_DIR}/deps/eigen-src")
-  GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
+if(NOT EXISTS "${EIGEN_DIR}/Eigen/Dense")
-  GIT_TAG 3.4.0)
+    file(DOWNLOAD "${EIGEN_URL}" "${EIGEN_TGZ}" SHOW_PROGRESS)
-FetchContent_GetProperties(Eigen3)
+    file(ARCHIVE_EXTRACT INPUT "${EIGEN_TGZ}" DESTINATION "${CMAKE_BINARY_DIR}/deps")
-if(NOT eigen3_POPULATED)
+    file(GLOB EIGEN_EXTRACTED_DIR "${CMAKE_BINARY_DIR}/deps/eigen-*")
-  FetchContent_Populate(Eigen3)
+    file(RENAME "${EIGEN_EXTRACTED_DIR}" "${EIGEN_DIR}")
-  message(STATUS "Eigen3 fetched")
+    message(STATUS "Eigen3 fetched")
 endif()
-file(CREATE_LINK ${eigen3_SOURCE_DIR}/Eigen
+file(CREATE_LINK ${EIGEN_DIR}/Eigen ${CMAKE_SOURCE_DIR}/lib/LatAnalyze/Eigen SYMBOLIC)
-     ${CMAKE_SOURCE_DIR}/lib/LatAnalyze/Eigen SYMBOLIC)
 
 # dependencies
 find_package(Threads REQUIRED)

ci-scripts/install-gsl.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-name='gsl-2.6'
+name='gsl-2.8'
 
 if (($# != 2)); then
   echo "usage: $(basename "$0") <prefix> <ntasks>" 1>&2
@@ -15,7 +15,7 @@ mkdir -p "${prefix}"
 cd "${prefix}"
 prefix=$(pwd -P)
 cd "${init_dir}/local/build"
-wget http://ftpmirror.gnu.org/gsl/${name}.tar.gz
+wget https://mirror.ibcp.fr/pub/gnu/gsl/${name}.tar.gz
 tar -xzvf ${name}.tar.gz
 mkdir -p ${name}/build
 cd ${name}/build

lib/CMakeLists.txt

@@ -88,10 +88,12 @@ install(
   FILE LatAnalyzeTargets.cmake
   NAMESPACE LatAnalyze::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LatAnalyze)
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
 configure_package_config_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
   "${CMAKE_CURRENT_BINARY_DIR}/LatAnalyzeConfig.cmake"
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LatAnalyze)
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LatAnalyze
+  PATH_VARS INCLUDE_INSTALL_DIR)
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/LatAnalyzeConfigVersion.cmake"
   VERSION "${PROJECT_VERSION}"

lib/Config.cmake.in

@@ -25,4 +25,6 @@ endforeach()
 
 include("${CMAKE_CURRENT_LIST_DIR}/LatAnalyzeTargets.cmake")
 
+set(@PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
+
 check_required_components(LatAnalyze)