Skip to content

Commit ef3d636

Browse files
authored
Update minimum CMake version to 3.10.0 (#3052)
* Update minimum CMake version to 3.10.0 This should fix the warnings that appeared with CMake 3.31: Compatibility with CMake < 3.10 will be removed from a future version of CMake. CMake 3.10.0 was released in November 2017, so this shouldn't be a hard requirement to meet. * update github actions
1 parent 28c46fb commit ef3d636

31 files changed

+37
-37
lines changed

.github/workflows/build_cpp.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ defaults:
3030
working-directory: dlib/test
3131

3232
jobs:
33-
ubuntu-22-04-gcc-default-cmake-3-8-ffmpeg5:
33+
ubuntu-22-04-gcc-default-cmake-3-10-ffmpeg5:
3434
runs-on: 'ubuntu-22.04'
3535
steps:
3636
- uses: actions/checkout@v2
@@ -40,18 +40,18 @@ jobs:
4040
sudo apt update
4141
sudo apt install libwebp-dev make yasm
4242
43-
- name: Cache cmake 3.8.0
43+
- name: Cache cmake 3.10.0
4444
uses: actions/cache@v3
4545
id: cache-cmake-download
4646
with:
4747
# cache this folder:
48-
path: ~/cmake-3.8.0-Linux-x86_64
49-
key: cmake-3.8.0_try3
48+
path: ~/cmake-3.10.0-Linux-x86_64
49+
key: cmake-3.10.0_try3
5050

5151
- run: |
5252
# Get the minimum version of cmake dlib supports
53-
wget https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.tar.gz
54-
tar -xf cmake-3.8.0-Linux-x86_64.tar.gz -C ~
53+
wget https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.tar.gz
54+
tar -xf cmake-3.10.0-Linux-x86_64.tar.gz -C ~
5555
if: steps.cache-cmake-download.outputs.cache-hit != 'true'
5656
5757
- name: Cache FFmpeg 5
@@ -76,7 +76,7 @@ jobs:
7676
run: |
7777
mkdir build
7878
cd build
79-
~/cmake-3.8.0-Linux-x86_64/bin/cmake -DCMAKE_PREFIX_PATH=/home/runner/ffmpeg-n5.1.3_installation ..
79+
~/cmake-3.10.0-Linux-x86_64/bin/cmake -DCMAKE_PREFIX_PATH=/home/runner/ffmpeg-n5.1.3_installation ..
8080
8181
- name: Build just tests
8282
run: |

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22

33
project(dlib_project)
44

dlib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66

7-
cmake_minimum_required(VERSION 3.8.0)
7+
cmake_minimum_required(VERSION 3.10.0)
88

99
set(CMAKE_DISABLE_SOURCE_CHANGES ON)
1010
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

dlib/cmake_utils/check_if_avx_instructions_executable_on_host.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This script checks if your compiler and host processor can generate and then run programs with AVX instructions.
22

3-
cmake_minimum_required(VERSION 3.8.0)
3+
cmake_minimum_required(VERSION 3.10.0)
44

55
# Don't rerun this script if its already been executed.
66
if (DEFINED AVX_IS_AVAILABLE_ON_HOST)

dlib/cmake_utils/check_if_neon_available.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This script checks if __ARM_NEON__ is defined for your compiler
22

3-
cmake_minimum_required(VERSION 3.8.0)
3+
cmake_minimum_required(VERSION 3.10.0)
44

55
# Don't rerun this script if its already been executed.
66
if (DEFINED ARM_NEON_IS_AVAILABLE)

dlib/cmake_utils/check_if_sse4_instructions_executable_on_host.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This script checks if your compiler and host processor can generate and then run programs with SSE4 instructions.
22

3-
cmake_minimum_required(VERSION 3.8.0)
3+
cmake_minimum_required(VERSION 3.10.0)
44

55
# Don't rerun this script if its already been executed.
66
if (DEFINED SSE4_IS_AVAILABLE_ON_HOST)

dlib/cmake_utils/find_ffmpeg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22

33
message(STATUS "Searching for FFMPEG/LIBAV")
44
find_package(PkgConfig)

dlib/cmake_utils/find_libjpeg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#This script just runs CMake's built in JPEG finding tool. But it also checks that the
22
#copy of libjpeg that cmake finds actually builds and links.
33

4-
cmake_minimum_required(VERSION 3.8.0)
4+
cmake_minimum_required(VERSION 3.10.0)
55

66
if (BUILDING_PYTHON_IN_MSVC)
77
# Never use any system copy of libjpeg when building python in visual studio

dlib/cmake_utils/find_libpng.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#This script just runs CMake's built in PNG finding tool. But it also checks that the
22
#copy of libpng that cmake finds actually builds and links.
33

4-
cmake_minimum_required(VERSION 3.8.0)
4+
cmake_minimum_required(VERSION 3.10.0)
55

66
if (BUILDING_PYTHON_IN_MSVC)
77
# Never use any system copy of libpng when building python in visual studio

dlib/cmake_utils/set_compiler_specific_options.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33

44

55
# Check if we are being built as part of a pybind11 module.

dlib/cmake_utils/tell_visual_studio_to_use_static_runtime.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Including this cmake script into your cmake project will cause visual studio
33
# to build your project against the static C runtime.
44

5-
cmake_minimum_required(VERSION 3.8.0)
5+
cmake_minimum_required(VERSION 3.10.0)
66

77
if (MSVC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
88
option (DLIB_FORCE_MSVC_STATIC_RUNTIME "use static runtime" ON)

dlib/cmake_utils/test_for_avx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(avx_test)
44

55
set(USE_AVX_INSTRUCTIONS ON CACHE BOOL "Use AVX instructions")

dlib/cmake_utils/test_for_cuda/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(cuda_test)
44

55
include_directories(../../cuda)

dlib/cmake_utils/test_for_cudnn/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(cudnn_test)
44

55
# Override the FindCUDA.cmake setting to avoid duplication of host flags if using a toolchain:

dlib/cmake_utils/test_for_libjpeg/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(test_if_libjpeg_is_broken)
44

55
find_package(JPEG)

dlib/cmake_utils/test_for_libjxl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(test_if_libjxl_is_broken)
44

55
include_directories(${JXL_INCLUDE_DIR})

dlib/cmake_utils/test_for_libpng/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(test_if_libpng_is_broken)
44

55
find_package(PNG)

dlib/cmake_utils/test_for_libwebp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(test_if_libwebp_is_broken)
44

55
include_directories(${WEBP_INCLUDE_DIR})

dlib/cmake_utils/test_for_neon/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(neon_test)
44

55
add_library(neon_test STATIC neon_test.cpp )

dlib/cmake_utils/test_for_sse4/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project(sse4_test)
44

55
set(USE_SSE4_INSTRUCTIONS ON CACHE BOOL "Use SSE4 instructions")

dlib/java/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33
project (myproject)
44
set(java_package_name net.dlib)
55
set(source_files

dlib/matlab/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33

44
PROJECT(mex_functions)
55

dlib/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# information about it at http://www.cmake.org
44
#
55

6-
cmake_minimum_required(VERSION 3.8.0)
6+
cmake_minimum_required(VERSION 3.10.0)
77

88
# create a variable called target_name and set it to the string "dtest"
99
set (target_name dtest)

dlib/test/blas_bindings/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# information about it at http://www.cmake.org
44
#
55

6-
cmake_minimum_required(VERSION 3.8.0)
6+
cmake_minimum_required(VERSION 3.10.0)
77

88
# This variable contains a list of all the tests we are building
99
# into the regression test suite.

dlib/test/tools/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8.0)
1+
cmake_minimum_required(VERSION 3.10.0)
22

33
add_subdirectory(../../../tools/imglab imglab_build)
44
add_subdirectory(../../../tools/htmlify htmlify_build)

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#
3333

3434

35-
cmake_minimum_required(VERSION 3.8.0)
35+
cmake_minimum_required(VERSION 3.10.0)
3636
# Every project needs a name. We call this the "examples" project.
3737
project(examples)
3838

tools/archive/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66

7-
cmake_minimum_required(VERSION 3.8.0)
7+
cmake_minimum_required(VERSION 3.10.0)
88
PROJECT(archive)
99

1010

tools/convert_dlib_nets_to_caffe/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# information about it at http://www.cmake.org
44
#
55

6-
cmake_minimum_required(VERSION 3.8.0)
6+
cmake_minimum_required(VERSION 3.10.0)
77

88
set (target_name dtoc)
99

tools/htmlify/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# information about it at http://www.cmake.org
44
#
55

6-
cmake_minimum_required(VERSION 3.8.0)
6+
cmake_minimum_required(VERSION 3.10.0)
77

88
# create a variable called target_name and set it to the string "htmlify"
99
set (target_name htmlify)

tools/imglab/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# information about it at http://www.cmake.org
44
#
55

6-
cmake_minimum_required(VERSION 3.8.0)
6+
cmake_minimum_required(VERSION 3.10.0)
77

88
# create a variable called target_name and set it to the string "imglab"
99
set (target_name imglab)

tools/python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0)
2+
CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0)
33

44
if (WIN32 AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
55
message(FATAL_ERROR "\n"

0 commit comments

Comments
 (0)