Revert "bump cmake to fix docker"

This reverts commit 3d9d9e3.

Author: casperdcl

CMakeLists.txt

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

recipe/meta.yaml

@@ -42,7 +42,8 @@ requirements:
     - pip
     - setuptools >=64
     - setuptools_scm >=8
-    - cmake >=3.20
+    - cmake         # [not osx]
+    - cmake >=3.16  # [osx]
     - 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.20'
+  cmake'>=3.16'
   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.20
+  - cmake >=3.16
   - setuptools <71
   - ipp-include=2021.12
   - ipp-devel=2021.12

src/Core/CMakeLists.txt

@@ -15,8 +15,6 @@
 #
 # Authors:
 # CIL Developers, listed at: https://github.com/TomographicImaging/CIL/blob/master/NOTICE.txt
-# Richard Brown (UCL)
-
 set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 if(NOT DEFINED CMAKE_BUILD_TYPE)
@@ -27,7 +25,6 @@ message ("OpenMP_CXX_FLAGS ${OpenMP_CXX_FLAGS}")
 find_package(OpenMP REQUIRED)
 add_definitions(${OpenMP_CXX_FLAGS})
 
-
 if (WIN32)
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ddll_EXPORTS")
 endif()