From bd02d0bc7cc9ab8d6f2b466b75a3af7dae0e3f14 Mon Sep 17 00:00:00 2001 From: injae <8687lee@gmail.com> Date: Sat, 30 Dec 2023 21:23:44 +0900 Subject: [PATCH] update catch2 2.9.1 -> 3.5.0 --- CMakeLists.txt | 2 +- cppm.toml | 2 +- thirdparty/Catch2/3.5.0/Catch2.cmake.in | 8 ++++++++ thirdparty/Catch2/3.5.0/cppkg.toml | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 thirdparty/Catch2/3.5.0/Catch2.cmake.in create mode 100644 thirdparty/Catch2/3.5.0/cppkg.toml diff --git a/CMakeLists.txt b/CMakeLists.txt index 98d9944..d75fb33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ cppm_compiler_option( find_cppkg(benchmark 1.5.2 MODULE benchmark::benchmark TYPE lib OPTIONAL OFF) find_cppkg(RapidJSON 1.1.1 MODULE rapidjson TYPE lib OPTIONAL OFF) find_cppkg(nlohmann_json 3.10.5 MODULE nlohmann_json::nlohmann_json TYPE lib OPTIONAL OFF) -find_cppkg(Catch2 2.9.1 MODULE Catch2::Catch2 TYPE lib OPTIONAL OFF) +find_cppkg(Catch2 3.5.0 MODULE Catch2::Catch2 TYPE lib OPTIONAL OFF) find_cppkg(toml11 3.7.0 MODULE toml11::toml11 TYPE lib OPTIONAL OFF) find_cppkg(yaml-cpp 0.7.0 MODULE yaml-cpp TYPE lib OPTIONAL OFF) find_cppkg(fmt 8.0.1 MODULE fmt::fmt-header-only TYPE lib OPTIONAL OFF) diff --git a/cppm.toml b/cppm.toml index c47716b..167eca1 100644 --- a/cppm.toml +++ b/cppm.toml @@ -98,7 +98,7 @@ source = ["tests/.*"] nlohmann_json = { version="3.10.5", link="public", optional=true} RapidJSON = { version="1.1.1", link="public", optional=true} benchmark = { version="1.5.2", optional=true} - Catch2 = {version="2.9.1", optional=true} + Catch2 = {version="3.5.0", optional=true} #pybind11 = "2.9.0" #hiredis = "git" #"redis++" = "1.3.2" diff --git a/thirdparty/Catch2/3.5.0/Catch2.cmake.in b/thirdparty/Catch2/3.5.0/Catch2.cmake.in new file mode 100644 index 0000000..0da910d --- /dev/null +++ b/thirdparty/Catch2/3.5.0/Catch2.cmake.in @@ -0,0 +1,8 @@ +# Cppkg Base Dependency Downloader +cmake_minimum_required(VERSION 3.6) +project(Catch2-3.5.0-install) + +set(CPPM_VERSION ${CPPM_VERSION}) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cppm_loader.cmake) +download_package(Catch2 3.5.0 URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz TYPE lib CMAKE_ARGS ${CMAKE_ARGS} -DCATCH_BUILD_TESTING=OFF) + diff --git a/thirdparty/Catch2/3.5.0/cppkg.toml b/thirdparty/Catch2/3.5.0/cppkg.toml new file mode 100644 index 0000000..31530f9 --- /dev/null +++ b/thirdparty/Catch2/3.5.0/cppkg.toml @@ -0,0 +1,6 @@ +[Catch2] +version = "3.5.0" +description = "modern, C++-native, header-only, test framework for unit-tests" +module = "Catch2::Catch2" +url="https://github.com/catchorg/Catch2/archive/refs/tags/v3.5.0.tar.gz" +flags="-DCATCH_BUILD_TESTING=OFF" \ No newline at end of file