From 187761b13746a1c373d98ea0c7ff0bdb88537fa8 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Mon, 1 Feb 2021 01:02:00 +0200 Subject: [PATCH] Reduce CMake requirements. --- module/CMakeLists.txt | 2 +- vendor/CPR/CMakeLists.txt | 13 +++++++------ vendor/MaxmindDB/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt index ee8f0511..461423b5 100644 --- a/module/CMakeLists.txt +++ b/module/CMakeLists.txt @@ -105,7 +105,7 @@ if(WIN32 OR MINGW) target_link_libraries(SqModule wsock32 ws2_32 shlwapi) endif() # Link to base libraries -target_link_libraries(SqModule Squirrel FmtLib SimpleINI TinyDir ConcurrentQueue cpr::cpr maxminddb::maxminddb) +target_link_libraries(SqModule Squirrel FmtLib SimpleINI TinyDir ConcurrentQueue cpr maxminddb) # Link to POCO libraries target_link_libraries(SqModule Poco::Foundation Poco::Encodings Poco::Crypto Poco::Util Poco::Data Poco::Net Poco::JSON Poco::XML Poco::Zip Poco::JWT Poco::Redis Poco::MongoDB) # Does POCO have SQLite support? diff --git a/vendor/CPR/CMakeLists.txt b/vendor/CPR/CMakeLists.txt index aca36da1..6607371f 100644 --- a/vendor/CPR/CMakeLists.txt +++ b/vendor/CPR/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.7) project(cpr VERSION 1.5.1 LANGUAGES CXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -49,7 +49,8 @@ endif() include(GNUInstallDirs) -include(FetchContent) +# Disabled to reduce CMAke requirements +#include(FetchContent) include(cmake/code_coverage.cmake) include(cmake/sanitizer.cmake) include(cmake/gcc_analyze.cmake) @@ -128,7 +129,7 @@ if(NOT USE_SYSTEM_CURL OR NOT CURL_FOUND) endif() # GTest configuration -if(BUILD_CPR_TESTS) +#[[if(BUILD_CPR_TESTS) if(USE_SYSTEM_GTEST) find_package(GTest) endif() @@ -156,11 +157,11 @@ if(BUILD_CPR_TESTS) set_property(TARGET gtest PROPERTY FOLDER "tests/gtest") set_property(TARGET gtest_main PROPERTY FOLDER "tests/gtest") endif() -endif() +endif()]] # Mongoose configuration -if(BUILD_CPR_TESTS) +#[[if(BUILD_CPR_TESTS) message(STATUS "Building mongoose project for test support.") if (SSL_ENABLED) find_package(OpenSSL) @@ -197,4 +198,4 @@ add_subdirectory(include) if(BUILD_CPR_TESTS) enable_testing() add_subdirectory(test) -endif() +endif()]] diff --git a/vendor/MaxmindDB/CMakeLists.txt b/vendor/MaxmindDB/CMakeLists.txt index 4a26fca0..4a31dcc1 100644 --- a/vendor/MaxmindDB/CMakeLists.txt +++ b/vendor/MaxmindDB/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.9) +cmake_minimum_required (VERSION 3.7) project(maxminddb LANGUAGES C VERSION 1.5.0