From 5f94ad5d53a45e8e3e6301f04c1c5f95d9f55c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Fri, 6 Sep 2024 20:17:21 +0200 Subject: [PATCH] increase cmake version to 3.17 --- .github/workflows/build_cpp.yml | 15 +++++++-------- CMakeLists.txt | 2 +- dlib/CMakeLists.txt | 7 +++---- dlib/cmake | 2 +- ...k_if_avx_instructions_executable_on_host.cmake | 2 +- dlib/cmake_utils/check_if_neon_available.cmake | 2 +- ..._if_sse4_instructions_executable_on_host.cmake | 2 +- dlib/cmake_utils/find_ffmpeg.cmake | 2 +- dlib/cmake_utils/find_libjpeg.cmake | 2 +- dlib/cmake_utils/find_libpng.cmake | 2 +- .../set_compiler_specific_options.cmake | 2 +- ...tell_visual_studio_to_use_static_runtime.cmake | 2 +- dlib/cmake_utils/test_for_avx/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_cuda/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_cudnn/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_libjpeg/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_libjxl/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_libpng/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_libwebp/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_neon/CMakeLists.txt | 2 +- dlib/cmake_utils/test_for_sse4/CMakeLists.txt | 2 +- dlib/external/cblas/CMakeLists.txt | 2 +- dlib/external/pybind11/CMakeLists.txt | 6 +++--- dlib/java/CMakeLists.txt | 2 +- dlib/java/cmake_swig_jni | 4 ++-- dlib/matlab/CMakeLists.txt | 2 +- dlib/matlab/cmake_mex_wrapper | 2 +- dlib/test/CMakeLists.txt | 8 +++----- dlib/test/blas_bindings/CMakeLists.txt | 2 +- dlib/test/tools/CMakeLists.txt | 2 +- docs/docs/release_notes.xml | 2 +- examples/CMakeLists.txt | 2 +- tools/archive/CMakeLists.txt | 2 +- tools/convert_dlib_nets_to_caffe/CMakeLists.txt | 2 +- tools/htmlify/CMakeLists.txt | 2 +- tools/imglab/CMakeLists.txt | 2 +- tools/python/CMakeLists.txt | 2 +- 37 files changed, 50 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build_cpp.yml b/.github/workflows/build_cpp.yml index e7ebcd097f..5889d9d68e 100644 --- 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 index da92454aab..ca00843f18 100644 --- 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 index 488a66967e..e7bfd29c74 100644 --- 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 index 224ba3a491..4a9d7b3985 100644 --- 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 index 4f2cfef933..717812678d 100644 --- 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 index 895c810b74..6ed6725cac 100644 --- 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 index c475609970..7fbe182aed 100644 --- 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 index b05955387b..4179013147 100644 --- 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 index 028217b075..1ae3b07ed7 100644 --- 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 index 6760739226..87e593c9a6 100644 --- 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 index 8093ca6d30..06220effc4 100644 --- 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 index 80122d8018..0d83f932bf 100644 --- 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 index 10890153cf..a19ca62bf9 100644 --- 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 index 8b6cd7e7b0..7392501f15 100644 --- 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 index 0ca0f6b6a2..4a0315a327 100644 --- 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 index a3c6910dbe..db740bca50 100644 --- 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 index c91b5d8ff6..b89e46fcbb 100644 --- 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 index 0be9206132..94ce87826d 100644 --- 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 index 9ea3ed10ea..83c4502638 100644 --- 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 index b9c6e51e8a..c27d339723 100644 --- 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 index 4cd4e95cef..e01aeafd4d 100644 --- 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 index c5379dd9fa..78ade59f3c 100644 --- 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 index 7db1bf668f..9156a623df 100644 --- 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 index b31bfad0d4..c87258ccc8 100644 --- 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 index 48f960f41f..d4127aa918 100644 --- 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 index 2dee98c60c..b9a5a12289 100644 --- 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 index 6cbc27afc6..0621b7dc6a 100644 --- 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 index 4154fa0a3b..bb06619b3d 100644 --- 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 $<$:-s>) - endif() + # strip debug symbols to make the binary smaller + target_link_options(${target_name} PRIVATE $<$:-s>) endif() diff --git a/dlib/test/blas_bindings/CMakeLists.txt b/dlib/test/blas_bindings/CMakeLists.txt index f9c0b05a12..883d237bd4 100644 --- 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 index 80371d6d84..f3db1a0cb2 100644 --- 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 index 97cb945486..38b3304e35 100644 --- 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 index 61af199179..e3357ab44b 100644 --- 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 index 796e469852..1753969e5e 100644 --- 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 index 2325366fe0..e043786042 100644 --- 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 index 35f327f275..8d8644fc18 100644 --- 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 index 5fb1331d15..316a879cd1 100644 --- 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 index 8309d5fb93..97759bd26b 100644 --- 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"