Skip to content

Commit fd9474b

Browse files
hjmallonhjmallon
committed
Update minimum CMake to v3.10
1 parent 870c38c commit fd9474b

File tree

651 files changed

+718
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

651 files changed

+718
-748
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ assignees: ''
1919
```cmake
2020
# CMakeLists.txt
2121
22-
cmake_minimum_required(VERSION 3.5)
22+
cmake_minimum_required(VERSION 3.10)
2323
2424
include("cmake/HunterGate.cmake")
2525
HunterGate(

‎cmake/modules/hunter_apply_gate_settings.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(CMakeParseArguments) # cmake_parse_arguments
77

‎cmake/modules/hunter_boost_component_b2_args.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) 2016, Ruslan Baratov
33
# All rights reserved.
44

5-
cmake_minimum_required(VERSION 3.5)
5+
cmake_minimum_required(VERSION 3.10)
66

77
# for iostreams dependency on ZLIB and BZIP2
88
include(hunter_add_package)

‎cmake/modules/hunter_calculate_config_sha1.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_assert_not_empty_string)
77
include(hunter_config)

‎cmake/modules/hunter_calculate_self.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_internal_error)
77
include(hunter_assert_not_empty_string)

‎cmake/modules/hunter_lock_directory.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_fatal_error)
77
include(hunter_status_debug)

‎cmake/modules/hunter_make_directory.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_internal_error)
77
include(hunter_lock_directory)

‎cmake/modules/hunter_set_config_location.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_internal_error)
77
include(hunter_status_print)

‎cmake/modules/hunter_setup_msvc.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2014-2016, Ruslan Baratov, Sumedh Ghaisas
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55

66
include(hunter_fatal_error)
77
include(hunter_internal_error)

‎cmake/projects/Avahi/schemes/url_sha1_avahi_autotools.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015 Ruslan Baratov, Alexandre Pretyman
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules")

‎cmake/projects/Boost/schemes/url_sha1_boost.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015 Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add
@@ -234,7 +234,7 @@ if(has_iphoneos)
234234
-d0
235235
${build_opts_iphoneos}
236236
install
237-
"--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"
237+
"--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"
238238
)
239239
else()
240240
# Add dummy target

‎cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013-2015, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/NASM/schemes/url_sha1_nasm_windows.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2017, Zhuhao Wang
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/OpenBLAS/schemes/OpenBLAS.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2016 Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add
@@ -68,7 +68,7 @@ if(CMAKE_CROSSCOMPILING OR ANDROID)
6868
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
6969
set(HOSTCC "clang")
7070
endif()
71-
71+
7272
set(cross_arg HOSTCC=${HOSTCC} CROSS=1 NOFORTRAN=1 ONLY_CBLAS=1)
7373

7474
# We also need to manually set target when cross compiling

‎cmake/projects/OpenSSL/ep-stages/configure.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.10)
22

33
if(NOT "@NASM_ROOT@" STREQUAL "")
44
set(ENV{PATH} "@NASM_ROOT@/bin;$ENV{PATH}")

‎cmake/projects/OpenSSL/ep-stages/configure_1_1_plus.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.10)
22

33
if(NOT "@NASM_ROOT@" STREQUAL "")
44
set(ENV{PATH} "@NASM_ROOT@/bin;$ENV{PATH}")

‎cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015 Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015 Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015 Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2014, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2016, Ruslan Baratov
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add
@@ -71,7 +71,7 @@ if(is_amd64 OR is_arm64)
7171
else()
7272
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
7373
set(arch "VC-WIN32-ONECORE")
74-
else()
74+
else()
7575
set(arch "VC-WIN32")
7676
endif()
7777
endif()

‎cmake/projects/Qt/ep-stages/qt-build.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.10)
22

33
### Input params check
44

‎cmake/projects/Qt/ep-stages/qt-configure.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Input params check
2-
cmake_minimum_required(VERSION 3.5)
2+
cmake_minimum_required(VERSION 3.10)
33

44
string(COMPARE EQUAL "@configure_command@" "" is_empty)
55
if(is_empty)

‎cmake/projects/Qt/ep-stages/qt-install.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Input params check
2-
cmake_minimum_required(VERSION 3.5)
2+
cmake_minimum_required(VERSION 3.10)
33

44
string(COMPARE EQUAL "@global_install_dir@" "" is_empty)
55
if(is_empty)

‎cmake/projects/Qt/schemes/url_sha1_qt.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2013, 2015-2016 Ruslan Baratov, Alexandre Pretyman
22
# All rights reserved.
33

4-
cmake_minimum_required(VERSION 3.5)
4+
cmake_minimum_required(VERSION 3.10)
55
project(Hunter)
66

77
include(ExternalProject) # ExternalProject_Add

‎cmake/projects/botan/schemes/url_sha1_botan.cmake.in

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.10)
22

33
project(Hunter)
44

@@ -71,13 +71,13 @@ hunter_get_build_flags(
7171
)
7272

7373
# Usage: configure.py [options]
74-
#
74+
#
7575
# Options:
7676
# --version show program's version number and exit
7777
# -h, --help show this help message and exit
7878
# --verbose Show debug messages
7979
# --quiet Show only warnings and errors
80-
#
80+
#
8181
# Target options:
8282
# --cpu=CPU set the target CPU architecture
8383
# --os=OS set the target operating system
@@ -110,7 +110,7 @@ hunter_get_build_flags(
110110
# --disable-altivec disable AltiVec intrinsics
111111
# --disable-neon disable NEON intrinsics
112112
# --disable-armv8crypto disable ARMv8Crypto intrinsics
113-
#
113+
#
114114
# Build options:
115115
# --with-debug-info include debug symbols
116116
# --with-sanitizers enable ASan/UBSan checks
@@ -142,14 +142,14 @@ hunter_get_build_flags(
142142
# --unsafe-fuzzer-mode Disable essential checks for testing
143143
# --build-fuzzers=TYPE Build fuzzers (afl, libfuzzer, klee, test)
144144
# --with-fuzzer-lib=LIB additionally link in LIB
145-
#
145+
#
146146
# Documentation Options:
147147
# --without-documentation Skip building/installing documentation
148148
# --with-sphinx Use Sphinx
149149
# --with-pdf Use Sphinx to generate PDF doc
150150
# --with-rst2man Use rst2man to generate man page
151151
# --with-doxygen Use Doxygen
152-
#
152+
#
153153
# Module selection:
154154
# --module-policy=POL module policy file (see src/build-
155155
# data/policy)
@@ -165,7 +165,7 @@ hunter_get_build_flags(
165165
# --with-sqlite3 use sqlite3
166166
# --with-zlib use zlib
167167
# --with-tpm use tpm
168-
#
168+
#
169169
# Installation options:
170170
# --program-suffix=SUFFIX append string to program names
171171
# --library-suffix=SUFFIX append string to library names
@@ -175,7 +175,7 @@ hunter_get_build_flags(
175175
# --libdir=DIR set the library install dir
176176
# --mandir=DIR set the install dir for man pages
177177
# --includedir=DIR set the include file install dir
178-
#
178+
#
179179
# Informational:
180180
# --list-modules list available modules and exit
181181
# --list-os-features list available OS features and exit

‎cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.10)
22

33
project(Hunter)
44

@@ -91,13 +91,13 @@ ExternalProject_Add(
9191
)
9292

9393
# Usage: configure.py [options]
94-
#
94+
#
9595
# Options:
9696
# --version show program's version number and exit
9797
# -h, --help show this help message and exit
9898
# --verbose Show debug messages
9999
# --quiet Show only warnings and errors
100-
#
100+
#
101101
# Target options:
102102
# --cpu=CPU set the target CPU architecture
103103
# --os=OS set the target operating system
@@ -130,7 +130,7 @@ ExternalProject_Add(
130130
# --disable-altivec disable AltiVec intrinsics
131131
# --disable-neon disable NEON intrinsics
132132
# --disable-armv8crypto disable ARMv8Crypto intrinsics
133-
#
133+
#
134134
# Build options:
135135
# --with-debug-info include debug symbols
136136
# --with-sanitizers enable ASan/UBSan checks
@@ -162,14 +162,14 @@ ExternalProject_Add(
162162
# --unsafe-fuzzer-mode Disable essential checks for testing
163163
# --build-fuzzers=TYPE Build fuzzers (afl, libfuzzer, klee, test)
164164
# --with-fuzzer-lib=LIB additionally link in LIB
165-
#
165+
#
166166
# Documentation Options:
167167
# --without-documentation Skip building/installing documentation
168168
# --with-sphinx Use Sphinx
169169
# --with-pdf Use Sphinx to generate PDF doc
170170
# --with-rst2man Use rst2man to generate man page
171171
# --with-doxygen Use Doxygen
172-
#
172+
#
173173
# Module selection:
174174
# --module-policy=POL module policy file (see src/build-
175175
# data/policy)
@@ -185,7 +185,7 @@ ExternalProject_Add(
185185
# --with-sqlite3 use sqlite3
186186
# --with-zlib use zlib
187187
# --with-tpm use tpm
188-
#
188+
#
189189
# Installation options:
190190
# --program-suffix=SUFFIX append string to program names
191191
# --library-suffix=SUFFIX append string to library names
@@ -195,7 +195,7 @@ ExternalProject_Add(
195195
# --libdir=DIR set the library install dir
196196
# --mandir=DIR set the install dir for man pages
197197
# --includedir=DIR set the include file install dir
198-
#
198+
#
199199
# Informational:
200200
# --list-modules list available modules and exit
201201
# --list-os-features list available OS features and exit
@@ -242,7 +242,7 @@ if(NOT "@HUNTER_JOBS_OPTION@" STREQUAL "")
242242
endif()
243243

244244
foreach(variant ${configure_architectures})
245-
245+
246246
hunter_status_debug("Configure architecture: ${variant}")
247247

248248
set(cc_abi_flags "${variant}")
@@ -302,7 +302,7 @@ foreach(variant ${configure_architectures})
302302
add_dependencies(
303303
"@HUNTER_EP_NAME@-ios_universal"
304304
"@HUNTER_EP_NAME@-${variant}"
305-
)
305+
)
306306
endforeach()
307307

308308
string(COMPARE EQUAL "${DEPENDS_ON_PKGCONFIGS}" "" default_pkgconfig)

0 commit comments

Comments
 (0)