diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fff71d40..4a1c2c3d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,7 +30,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2 with: - cmake-version: 3.13.5 + cmake-version: 3.20.6 - name: Setup ninja uses: ashutoshvarma/setup-ninja@66ad2db9ed7d211c065daeeb849e9c8c895773c9 # master diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bdb4ff4..35a44d22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.5) +cmake_minimum_required(VERSION 3.20.6) set(PYTHON_VERSION "3.9.22" CACHE STRING "The version of Python to build.") @@ -113,7 +113,7 @@ cmake_dependent_option(USE_SYSTEM_ZLIB "Use system ZLIB" ${_use_system_zlib_defa cmake_dependent_option(USE_SYSTEM_GDBM "Use system GDBM" ON "USE_SYSTEM_LIBRARIES" OFF) cmake_dependent_option(USE_SYSTEM_READLINE "Use system READLINE" ON "USE_SYSTEM_LIBRARIES" OFF) cmake_dependent_option(USE_SYSTEM_SQLite3 "Use system SQLITE3" ON "USE_SYSTEM_LIBRARIES" OFF) - cmake_dependent_option(USE_SYSTEM_LIBMPDEC "Use system LIBMPDEC" ON "USE_SYSTEM_LIBRARIES" OFF) +cmake_dependent_option(USE_SYSTEM_LIBMPDEC "Use system LIBMPDEC" OFF "USE_SYSTEM_LIBRARIES" OFF) cmake_dependent_option(USE_BUILTIN_ZLIB "Use builtin ZLIB" ${_use_builtin_zlib_default} "NOT USE_SYSTEM_ZLIB" OFF) diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index ce0efc62..6e55bda6 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -165,12 +165,7 @@ if(DEFINED SQLITE3_LIBRARY) set(SQLite3_LIBRARY ${SQLITE3_LIBRARY}) endif() if(USE_SYSTEM_SQLite3) - if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.14") find_package(SQLite3) # https://cmake.org/cmake/help/latest/module/FindSQLite3.html - else() - find_path(SQLite3_INCLUDE_DIR sqlite3.h) - find_library(SQLite3_LIBRARY sqlite3) - endif() endif() set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR}) set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})