increase cmake version to 3.17

davisking · Sep 7, 2024 · 5f94ad5 · 5f94ad5
1 parent e254b70
commit 5f94ad5
Show file tree

Hide file tree

Showing 37 changed files with 50 additions and 54 deletions.
diff --git a/.github/workflows/build_cpp.yml b/.github/workflows/build_cpp.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - master
-    - cuda-cmake
     paths:
     - ".github/workflows/build_cpp.yml"
     - "**.cpp"
@@ -31,7 +30,7 @@ defaults:
     working-directory: dlib/test
 
 jobs:
-  ubuntu-latest-gcc-default-cmake-3-8-ffmpeg5:
+  ubuntu-latest-gcc-default-cmake-3-17-ffmpeg5:
     runs-on: 'ubuntu-latest'
     steps:
     - uses: actions/checkout@v2
@@ -41,18 +40,18 @@ jobs:
         sudo apt update
         sudo apt install libwebp-dev make yasm
         
-    - name: Cache cmake 3.8.0
+    - name: Cache cmake 3.17.0
       uses: actions/cache@v3
       id: cache-cmake-download
       with:
         # cache this folder:
-        path: ~/cmake-3.8.0-Linux-x86_64
-        key: cmake-3.8.0_try3
+        path: ~/cmake-3.17.0-Linux-x86_64
+        key: cmake-3.17.0_try3
 
     - run: |
         # Get the minimum version of cmake dlib supports
-        wget https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.tar.gz
-        tar -xf cmake-3.8.0-Linux-x86_64.tar.gz -C ~
+        wget https://cmake.org/files/v3.17/cmake-3.17.0-Linux-x86_64.tar.gz
+        tar -xf cmake-3.17.0-Linux-x86_64.tar.gz -C ~
       if: steps.cache-cmake-download.outputs.cache-hit != 'true'
 
     - name: Cache FFmpeg 5
@@ -77,7 +76,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        ~/cmake-3.8.0-Linux-x86_64/bin/cmake -DCMAKE_PREFIX_PATH=/home/runner/ffmpeg-n5.1.3_installation .. 
+        ~/cmake-3.17.0-Linux-x86_64/bin/cmake -DCMAKE_PREFIX_PATH=/home/runner/ffmpeg-n5.1.3_installation .. 
     
     - name: Build just tests
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 project(dlib_project)
 

diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
@@ -647,16 +647,15 @@ if (NOT TARGET dlib)
          endif()
       endif()
 
-      find_package(OpenMP)
-      set(openmp_libraries ${OpenMP_CXX_FLAGS}) 
-
 
       if (DLIB_USE_CUDA)
          find_package(CUDAToolkit 9.1)
          set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake_utils)
          find_package(CUDNN)
+         find_package(OpenMP)
+         set(openmp_libraries ${OpenMP_CXX_FLAGS}) 
 
-         if (CUDAToolkit_FOUND AND CUDNN_FOUND)
+         if (CUDAToolkit_FOUND AND CUDNN_FOUND AND OPENMP_FOUND)
             set(source_files ${source_files} 
                cuda/cuda_dlib.cu 
                cuda/cudnn_dlibapi.cpp

diff --git a/dlib/cmake b/dlib/cmake
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR} dlib_build)
 
diff --git a/dlib/cmake_utils/check_if_avx_instructions_executable_on_host.cmake b/dlib/cmake_utils/check_if_avx_instructions_executable_on_host.cmake
@@ -1,6 +1,6 @@
 # This script checks if your compiler and host processor can generate and then run programs with AVX instructions.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # Don't rerun this script if its already been executed.
 if (DEFINED AVX_IS_AVAILABLE_ON_HOST)

diff --git a/dlib/cmake_utils/check_if_neon_available.cmake b/dlib/cmake_utils/check_if_neon_available.cmake
@@ -1,6 +1,6 @@
 # This script checks if __ARM_NEON__ is defined for your compiler
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # Don't rerun this script if its already been executed.
 if (DEFINED ARM_NEON_IS_AVAILABLE)

diff --git a/dlib/cmake_utils/check_if_sse4_instructions_executable_on_host.cmake b/dlib/cmake_utils/check_if_sse4_instructions_executable_on_host.cmake
@@ -1,6 +1,6 @@
 # This script checks if your compiler and host processor can generate and then run programs with SSE4 instructions.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # Don't rerun this script if its already been executed.
 if (DEFINED SSE4_IS_AVAILABLE_ON_HOST)

diff --git a/dlib/cmake_utils/find_ffmpeg.cmake b/dlib/cmake_utils/find_ffmpeg.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 message(STATUS "Searching for FFMPEG/LIBAV")
 find_package(PkgConfig)

diff --git a/dlib/cmake_utils/find_libjpeg.cmake b/dlib/cmake_utils/find_libjpeg.cmake
@@ -1,7 +1,7 @@
 #This script just runs CMake's built in JPEG finding tool.  But it also checks that the
 #copy of libjpeg that cmake finds actually builds and links.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 if (BUILDING_PYTHON_IN_MSVC)
    # Never use any system copy of libjpeg when building python in visual studio

diff --git a/dlib/cmake_utils/find_libpng.cmake b/dlib/cmake_utils/find_libpng.cmake
@@ -1,7 +1,7 @@
 #This script just runs CMake's built in PNG finding tool.  But it also checks that the
 #copy of libpng that cmake finds actually builds and links.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 if (BUILDING_PYTHON_IN_MSVC)
    # Never use any system copy of libpng when building python in visual studio

diff --git a/dlib/cmake_utils/set_compiler_specific_options.cmake b/dlib/cmake_utils/set_compiler_specific_options.cmake
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 
 # Check if we are being built as part of a pybind11 module. 

diff --git a/dlib/cmake_utils/tell_visual_studio_to_use_static_runtime.cmake b/dlib/cmake_utils/tell_visual_studio_to_use_static_runtime.cmake
@@ -2,7 +2,7 @@
 # Including this cmake script into your cmake project will cause visual studio
 # to build your project against the static C runtime.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 if (MSVC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
    option (DLIB_FORCE_MSVC_STATIC_RUNTIME "use static runtime" ON)

diff --git a/dlib/cmake_utils/test_for_avx/CMakeLists.txt b/dlib/cmake_utils/test_for_avx/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(avx_test)
 
 set(USE_AVX_INSTRUCTIONS ON CACHE BOOL "Use AVX instructions")

diff --git a/dlib/cmake_utils/test_for_cuda/CMakeLists.txt b/dlib/cmake_utils/test_for_cuda/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(cuda_test)
 
 include_directories(../../cuda)

diff --git a/dlib/cmake_utils/test_for_cudnn/CMakeLists.txt b/dlib/cmake_utils/test_for_cudnn/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(cudnn_test)
 
 # Override the FindCUDA.cmake setting to avoid duplication of host flags if using a toolchain:

diff --git a/dlib/cmake_utils/test_for_libjpeg/CMakeLists.txt b/dlib/cmake_utils/test_for_libjpeg/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(test_if_libjpeg_is_broken)
 
 find_package(JPEG)

diff --git a/dlib/cmake_utils/test_for_libjxl/CMakeLists.txt b/dlib/cmake_utils/test_for_libjxl/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(test_if_libjxl_is_broken)
 
 include_directories(${JXL_INCLUDE_DIR})

diff --git a/dlib/cmake_utils/test_for_libpng/CMakeLists.txt b/dlib/cmake_utils/test_for_libpng/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(test_if_libpng_is_broken)
 
 find_package(PNG)

diff --git a/dlib/cmake_utils/test_for_libwebp/CMakeLists.txt b/dlib/cmake_utils/test_for_libwebp/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(test_if_libwebp_is_broken)
 
 include_directories(${WEBP_INCLUDE_DIR})

diff --git a/dlib/cmake_utils/test_for_neon/CMakeLists.txt b/dlib/cmake_utils/test_for_neon/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(neon_test)
 
 add_library(neon_test STATIC neon_test.cpp )

diff --git a/dlib/cmake_utils/test_for_sse4/CMakeLists.txt b/dlib/cmake_utils/test_for_sse4/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(sse4_test)
 
 set(USE_SSE4_INSTRUCTIONS ON CACHE BOOL "Use SSE4 instructions")

diff --git a/dlib/external/cblas/CMakeLists.txt b/dlib/external/cblas/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project(cblas)
 
 

diff --git a/dlib/external/pybind11/CMakeLists.txt b/dlib/external/pybind11/CMakeLists.txt
@@ -77,9 +77,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   if(OSX AND CMAKE_VERSION VERSION_LESS 3.7)
     # Bug in macOS CMake < 3.7 is unable to download catch
     message(WARNING "CMAKE 3.7+ needed on macOS to download catch, and newer HIGHLY recommended")
-  elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.8)
-    # Only tested with 3.8+ in CI.
-    message(WARNING "CMAKE 3.8+ tested on Windows, previous versions untested")
+  elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.17)
+    # Only tested with 3.8´17+ in CI.
+    message(WARNING "CMAKE 3.17+ tested on Windows, previous versions untested")
   endif()
 
   message(STATUS "CMake ${CMAKE_VERSION}")

diff --git a/dlib/java/CMakeLists.txt b/dlib/java/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 project (myproject)
 set(java_package_name net.dlib)
 set(source_files

diff --git a/dlib/java/cmake_swig_jni b/dlib/java/cmake_swig_jni
@@ -2,7 +2,7 @@
 # it by defining some CMake variables and then include(cmake_swig_jni).  You
 # would make a CMakeLists.txt file that looks like the following:
 #
-#   cmake_minimum_required (VERSION 3.8.0)
+#   cmake_minimum_required (VERSION 3.17.0)
 #   project (example)
 #   set(java_package_name "org.mycompany")
 #   set(source_files
@@ -40,7 +40,7 @@
 ################################################################################
 ################################################################################
 
-cmake_minimum_required (VERSION 3.8.0)
+cmake_minimum_required (VERSION 3.17.0)
 
 # This block of code tries to figure out what the JAVA_HOME environment
 # variable should be by looking at the folder that contains the java

diff --git a/dlib/matlab/CMakeLists.txt b/dlib/matlab/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 PROJECT(mex_functions)
 

diff --git a/dlib/matlab/cmake_mex_wrapper b/dlib/matlab/cmake_mex_wrapper
@@ -3,7 +3,7 @@
 # that additional library dependencies can be added like this: add_mex_function(name lib1 dlib libetc).
 # That is, just add more libraries after the name and they will be build into the mex file.
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 set(BUILDING_MATLAB_MEX_FILE true)
 set(CMAKE_POSITION_INDEPENDENT_CODE True)

diff --git a/dlib/test/CMakeLists.txt b/dlib/test/CMakeLists.txt
@@ -3,7 +3,7 @@
 # information about it at http://www.cmake.org
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # create a variable called target_name and set it to the string "dtest"
 set (target_name dtest)
@@ -213,10 +213,8 @@ else() # basically Clang
    # This is for the comment in face_detection_ex.cpp that says "faces/*.jpg"
    add_compile_options(-Wno-comment)
 
-   if(${CMAKE_VERSION} VERSION_GREATER "3.8.0") 
-      # strip debug symbols to make the binary smaller
-      target_link_options(${target_name} PRIVATE $<$<CONFIG:RELEASE>:-s>)
-   endif()
+   # strip debug symbols to make the binary smaller
+   target_link_options(${target_name} PRIVATE $<$<CONFIG:RELEASE>:-s>)
 endif()
 
 

diff --git a/dlib/test/blas_bindings/CMakeLists.txt b/dlib/test/blas_bindings/CMakeLists.txt
@@ -3,7 +3,7 @@
 # information about it at http://www.cmake.org
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # This variable contains a list of all the tests we are building
 # into the regression test suite.

diff --git a/dlib/test/tools/CMakeLists.txt b/dlib/test/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 add_subdirectory(../../../tools/imglab imglab_build)
 add_subdirectory(../../../tools/htmlify htmlify_build)

diff --git a/docs/docs/release_notes.xml b/docs/docs/release_notes.xml
@@ -58,7 +58,7 @@ New Features and Improvements:
    - FFMPEG wrappers: dlib::ffmpeg::decoder and dlib::ffmpeg::demuxer (PR #2707)
 
 Non-Backwards Compatible Changes:
-   - Dlib now requires C++14 and at least CMake version 3.8.0.
+   - Dlib now requires C++14 and at least CMake version 3.17.0.
 
 Bug fixes:
    - Various adjustments to avoid errors on unusual platforms of system configurations.

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -32,7 +32,7 @@
 #
 
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 # Every project needs a name.  We call this the "examples" project.
 project(examples)
 

diff --git a/tools/archive/CMakeLists.txt b/tools/archive/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 PROJECT(archive)
 
 

diff --git a/tools/convert_dlib_nets_to_caffe/CMakeLists.txt b/tools/convert_dlib_nets_to_caffe/CMakeLists.txt
@@ -3,7 +3,7 @@
 # information about it at http://www.cmake.org
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 set (target_name dtoc)
 

diff --git a/tools/htmlify/CMakeLists.txt b/tools/htmlify/CMakeLists.txt
@@ -3,7 +3,7 @@
 # information about it at http://www.cmake.org
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # create a variable called target_name and set it to the string "htmlify"
 set (target_name htmlify)

diff --git a/tools/imglab/CMakeLists.txt b/tools/imglab/CMakeLists.txt
@@ -3,7 +3,7 @@
 # information about it at http://www.cmake.org
 #
 
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.17.0)
 
 # create a variable called target_name and set it to the string "imglab"
 set (target_name imglab)

diff --git a/tools/python/CMakeLists.txt b/tools/python/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.17.0)
 
 if (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio") 
    message(FATAL_ERROR "\n"