From 81ce5fcdb7a0960d6016dcd372c9bda1d7c4bff2 Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 30 Aug 2023 22:20:37 +0200 Subject: [PATCH] Remove obsolete part from cmake configuration files (#2871) Updating minimum CMake version to 3.11 --- CMakeLists.txt | 6 ++---- bench/CMakeLists.txt | 22 +++++++++------------- example/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 407d9976..e7c46067 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.10...3.21) +cmake_minimum_required(VERSION 3.11...3.21) # --------------------------------------------------------------------------------------- # Start spdlog project @@ -129,9 +129,7 @@ option( option(SPDLOG_DISABLE_DEFAULT_LOGGER "Disable default logger creation" OFF) # clang-tidy -if(${CMAKE_VERSION} VERSION_GREATER "3.5") - option(SPDLOG_TIDY "run clang-tidy" OFF) -endif() +option(SPDLOG_TIDY "run clang-tidy" OFF) if(SPDLOG_TIDY) set(CMAKE_CXX_CLANG_TIDY "clang-tidy") diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt index 8003886a..3806b24b 100644 --- a/bench/CMakeLists.txt +++ b/bench/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.11) project(spdlog_bench CXX) if(NOT TARGET spdlog) @@ -12,19 +12,15 @@ find_package(Threads REQUIRED) find_package(benchmark CONFIG) if(NOT benchmark_FOUND) message(STATUS "Using CMake Version ${CMAKE_VERSION}") - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.11.0") - # User can fetch googlebenchmark - message(STATUS "Downloading GoogleBenchmark") - include(FetchContent) + # User can fetch googlebenchmark + message(STATUS "Downloading GoogleBenchmark") + include(FetchContent) - # disable tests - set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "") - # Do not build and run googlebenchmark tests - FetchContent_Declare(googlebenchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.6.0) - FetchContent_MakeAvailable(googlebenchmark) - else() - message(FATAL_ERROR "GoogleBenchmark is missing. Use CMake >= 3.11 or download it") - endif() + # disable tests + set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "") + # Do not build and run googlebenchmark tests + FetchContent_Declare(googlebenchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.6.0) + FetchContent_MakeAvailable(googlebenchmark) endif() add_executable(bench bench.cpp) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index a7863493..da1ed4e2 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT) -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.11) project(spdlog_examples CXX) if(NOT TARGET spdlog) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1480b842..f5dec032 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.11) project(spdlog_utests CXX) if(NOT TARGET spdlog)