bump cmake to fix docker

Author: casperdcl

CMakeLists.txt

@@ -15,12 +15,7 @@
 #
 # Authors:
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
-
-if(APPLE)
-  cmake_minimum_required(VERSION 3.16)
-else()
-  cmake_minimum_required(VERSION 3.5)
-endif()
+cmake_minimum_required(VERSION 3.20)
 
 if(NOT SKBUILD_PROJECT_NAME)
   set(SKBUILD_PROJECT_NAME cil)

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "scikit_build_core.build"
 
 [tool.scikit-build]
 minimum-version = "build-system.requires"
-cmake.version = ">=3.5"
+cmake.version = ">=3.20"
 metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 sdist.include = ["Wrappers/Python/cil/version.py"]
 sdist.exclude = ["scripts", "docs", "Wrappers/Python/data", "Wrappers/Python/test", ".*"]

recipe/meta.yaml

@@ -42,8 +42,7 @@ requirements:
     - pip
     - setuptools >=64
     - setuptools_scm >=8
-    - cmake         # [not osx]
-    - cmake >=3.16  # [osx]
+    - cmake >=3.20
     - libgcc-ng     # [linux]
     - libstdcxx-ng  # [linux]
     - _openmp_mutex # [linux]

scripts/create_local_env_for_cil_development.sh

@@ -48,7 +48,7 @@ echo "Environment name $name"
 conda_args=(create --name="$name"
   python="$python"
   numpy="$numpy"
-  cmake'>=3.16'
+  cmake'>=3.20'
   dxchange
   h5py
   ipp'>=2021.10'
@@ -99,7 +99,7 @@ else
   )
 fi
 
-conda "${conda_args[@]}" 
+conda "${conda_args[@]}"
 if [[ -n "${pip_install_pkgs[@]}" ]]; then
   python -m pip install "${pip_install_pkgs[@]}"
-fi
+fi

scripts/requirements-test.yml

@@ -29,7 +29,7 @@ dependencies:
   - python-wget
   - scikit-image
   - packaging
-  - cmake >=3.16
+  - cmake >=3.20
   - setuptools <71
   - ipp-include=2021.12
   - ipp-devel=2021.12

src/Core/CMakeLists.txt

@@ -66,9 +66,9 @@ endif()
 if(IPP_CORE AND IPP_S AND IPP_VM AND IPP_I)
   set(USE_IPP TRUE)
   message("IPP libraries found")
-  get_filename_component(LIB_BASE ${IPP_CORE}/../.. REALPATH)
+  file(REAL_PATH ${IPP_CORE}/../.. LIB_BASE)
   find_file(IPP_INCLUDE ipp.h ${LIB_BASE} PATH_SUFFIXES include include/ipp)
-  get_filename_component(IPP_INCLUDE ${IPP_INCLUDE}/.. REALPATH)
+  cmake_path(GET IPP_INCLUDE PARENT_PATH IPP_INCLUDE)
 else()
   set(USE_IPP FALSE)
   message("IPP libraries not found, FBP_filtering not in build")