Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update minimum CMake to v3.10 #769

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ assignees: ''
```cmake
# CMakeLists.txt

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include("cmake/HunterGate.cmake")
HunterGate(
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

* I've checked this [Git style guide](https://0.readthedocs.io/en/latest/git.html). **[Yes|No]**
* I've checked this [CMake style guide](https://0.readthedocs.io/en/latest/cmake.html). **[Yes|No]**
* My change will work with CMake 3.5 (minimum requirement for Hunter). **[Yes|No]**
* My change will work with CMake 3.10 (minimum requirement for Hunter). **[Yes|No]**
* I will try to keep this pull request as small as possible and will try not to mix unrelated features. **[Yes|No]**

---
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_apply_gate_settings.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(CMakeParseArguments) # cmake_parse_arguments

Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_boost_component_b2_args.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

# for iostreams dependency on ZLIB and BZIP2
include(hunter_add_package)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_calculate_config_sha1.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_assert_not_empty_string)
include(hunter_config)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_calculate_self.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_internal_error)
include(hunter_assert_not_empty_string)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_lock_directory.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_fatal_error)
include(hunter_status_debug)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_make_directory.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_internal_error)
include(hunter_lock_directory)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_set_config_location.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_internal_error)
include(hunter_status_print)
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/hunter_setup_msvc.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2014-2016, Ruslan Baratov, Sumedh Ghaisas
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

include(hunter_fatal_error)
include(hunter_internal_error)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov, Alexandre Pretyman
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules")
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Boost/schemes/url_sha1_boost.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down Expand Up @@ -234,7 +234,7 @@ if(has_iphoneos)
-d0
${build_opts_iphoneos}
install
"--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"
"--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@"
)
else()
# Add dummy target
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013-2015, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/NASM/schemes/url_sha1_nasm_windows.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2017, Zhuhao Wang
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
4 changes: 2 additions & 2 deletions cmake/projects/OpenBLAS/schemes/OpenBLAS.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2016 Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down Expand Up @@ -68,7 +68,7 @@ if(CMAKE_CROSSCOMPILING OR ANDROID)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
set(HOSTCC "clang")
endif()

set(cross_arg HOSTCC=${HOSTCC} CROSS=1 NOFORTRAN=1 ONLY_CBLAS=1)

# We also need to manually set target when cross compiling
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/OpenSSL/ep-stages/configure.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

if(NOT "@NASM_ROOT@" STREQUAL "")
set(ENV{PATH} "@NASM_ROOT@/bin;$ENV{PATH}")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

if(NOT "@NASM_ROOT@" STREQUAL "")
set(ENV{PATH} "@NASM_ROOT@/bin;$ENV{PATH}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015 Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2014, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2016, Ruslan Baratov
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down Expand Up @@ -71,7 +71,7 @@ if(is_amd64 OR is_arm64)
else()
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
set(arch "VC-WIN32-ONECORE")
else()
else()
set(arch "VC-WIN32")
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Qt/ep-stages/qt-build.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

### Input params check

Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Qt/ep-stages/qt-configure.cmake.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Input params check
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

string(COMPARE EQUAL "@configure_command@" "" is_empty)
if(is_empty)
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Qt/ep-stages/qt-install.cmake.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Input params check
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

string(COMPARE EQUAL "@global_install_dir@" "" is_empty)
if(is_empty)
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Qt/schemes/url_sha1_qt.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2013, 2015-2016 Ruslan Baratov, Alexandre Pretyman
# All rights reserved.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
project(Hunter)

include(ExternalProject) # ExternalProject_Add
Expand Down
16 changes: 8 additions & 8 deletions cmake/projects/botan/schemes/url_sha1_botan.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)

project(Hunter)

Expand Down Expand Up @@ -71,13 +71,13 @@ hunter_get_build_flags(
)

# Usage: configure.py [options]
#
#
# Options:
# --version show program's version number and exit
# -h, --help show this help message and exit
# --verbose Show debug messages
# --quiet Show only warnings and errors
#
#
# Target options:
# --cpu=CPU set the target CPU architecture
# --os=OS set the target operating system
Expand Down Expand Up @@ -110,7 +110,7 @@ hunter_get_build_flags(
# --disable-altivec disable AltiVec intrinsics
# --disable-neon disable NEON intrinsics
# --disable-armv8crypto disable ARMv8Crypto intrinsics
#
#
# Build options:
# --with-debug-info include debug symbols
# --with-sanitizers enable ASan/UBSan checks
Expand Down Expand Up @@ -142,14 +142,14 @@ hunter_get_build_flags(
# --unsafe-fuzzer-mode Disable essential checks for testing
# --build-fuzzers=TYPE Build fuzzers (afl, libfuzzer, klee, test)
# --with-fuzzer-lib=LIB additionally link in LIB
#
#
# Documentation Options:
# --without-documentation Skip building/installing documentation
# --with-sphinx Use Sphinx
# --with-pdf Use Sphinx to generate PDF doc
# --with-rst2man Use rst2man to generate man page
# --with-doxygen Use Doxygen
#
#
# Module selection:
# --module-policy=POL module policy file (see src/build-
# data/policy)
Expand All @@ -165,7 +165,7 @@ hunter_get_build_flags(
# --with-sqlite3 use sqlite3
# --with-zlib use zlib
# --with-tpm use tpm
#
#
# Installation options:
# --program-suffix=SUFFIX append string to program names
# --library-suffix=SUFFIX append string to library names
Expand All @@ -175,7 +175,7 @@ hunter_get_build_flags(
# --libdir=DIR set the library install dir
# --mandir=DIR set the install dir for man pages
# --includedir=DIR set the include file install dir
#
#
# Informational:
# --list-modules list available modules and exit
# --list-os-features list available OS features and exit
Expand Down
Loading
Loading