diff --git a/CMakeLists.txt b/CMakeLists.txt index ccf9add..c206ed6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14...3.22) # ---- Project ---- @@ -28,7 +28,7 @@ CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.8.0") CPMAddPackage( NAME fmt - GIT_TAG 7.1.3 + GIT_TAG 8.1.1 GITHUB_REPOSITORY fmtlib/fmt OPTIONS "FMT_INSTALL YES" # create an installable target ) @@ -45,7 +45,6 @@ file(GLOB_RECURSE sources CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/source/ # Note: for header-only libraries change all PUBLIC flags to INTERFACE and create an interface # target: add_library(${PROJECT_NAME} INTERFACE) add_library(${PROJECT_NAME} ${headers} ${sources}) - set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17) # being a cross-platform target, we enforce standards conformance on MSVC @@ -75,5 +74,5 @@ packageProject( INCLUDE_DESTINATION include/${PROJECT_NAME}-${PROJECT_VERSION} VERSION_HEADER "${VERSION_HEADER_LOCATION}" COMPATIBILITY SameMajorVersion - DEPENDENCIES "fmt 7.1.3" + DEPENDENCIES "fmt 8.1.1" ) diff --git a/all/CMakeLists.txt b/all/CMakeLists.txt index db5f5fb..8092382 100644 --- a/all/CMakeLists.txt +++ b/all/CMakeLists.txt @@ -1,7 +1,7 @@ # this script adds all subprojects to a single build to allow IDEs understand the full project # structure. -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14...3.22) project(BuildAll LANGUAGES CXX) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index b5e436a..a10f926 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -1,4 +1,4 @@ -set(CPM_DOWNLOAD_VERSION 0.32.0) +set(CPM_DOWNLOAD_VERSION 0.35.0) if(CPM_SOURCE_CACHE) # Expand relative path. This is important if the provided path contains a tilde (~) diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 4ae5b49..4cad236 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14...3.22) project(GreeterDocs) diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt index d98277e..a932149 100644 --- a/standalone/CMakeLists.txt +++ b/standalone/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14...3.22) project(GreeterStandalone LANGUAGES CXX) @@ -12,7 +12,7 @@ include(../cmake/CPM.cmake) CPMAddPackage( GITHUB_REPOSITORY jarro2783/cxxopts - VERSION 2.2.1 + VERSION 3.0.0 OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 184a2f4..3b94e9e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14...3.22) project(GreeterTests LANGUAGES CXX) @@ -15,8 +15,8 @@ include(../cmake/tools.cmake) include(../cmake/CPM.cmake) -CPMAddPackage("gh:onqtam/doctest#2.4.5") -CPMAddPackage("gh:TheLartians/Format.cmake@1.7.0") +CPMAddPackage("gh:onqtam/doctest@2.4.8") +CPMAddPackage("gh:TheLartians/Format.cmake@1.7.3") if(TEST_INSTALLED_VERSION) find_package(Greeter REQUIRED)