bump 3rd party libs && bump version to 1.3.0

* gtest v1.14.0 * libfmt 10.1.1 * expected-lite latest * rapidjson - latest * boost 1.83
jinja2cpp · Oct 13, 2023 · 96b0e3c · 96b0e3c
1 parent 3d782f1
commit 96b0e3c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.23.0)
-project(Jinja2Cpp VERSION 1.2.2)
+project(Jinja2Cpp VERSION 1.3.0)
 
 if (${CMAKE_VERSION} VERSION_GREATER "3.12")
     cmake_policy(SET CMP0074 OLD)

diff --git a/conanfile.txt b/conanfile.txt
@@ -0,0 +1,13 @@
+[requires]
+boost/1.83.0
+expected-lite/0.6.3
+fmt/10.1.1
+nlohmann_json/3.11.2
+optional-lite/3.5.0
+rapidjson/cci.20220822
+string-view-lite/1.7.0
+variant-lite/2.0.0
+
+[generators]
+CMakeDeps
+CMakeToolchain
diff --git a/thirdparty/fmtlib b/thirdparty/fmtlib
diff --git a/thirdparty/gtest b/thirdparty/gtest
diff --git a/thirdparty/json/rapid b/thirdparty/json/rapid
diff --git a/thirdparty/nonstd/expected-lite b/thirdparty/nonstd/expected-lite
diff --git a/thirdparty/thirdparty-conan-build.cmake b/thirdparty/thirdparty-conan-build.cmake
@@ -6,10 +6,10 @@ find_package(optional-lite REQUIRED)
 find_package(string-view-lite REQUIRED)
 find_package(nlohmann_json REQUIRED)
 
-find_package(Boost COMPONENTS algorithm filesystem json optional variant REQUIRED)
-set(CONAN_BOOST_PACKAGE_NAME Boost::boost)
+find_package(Boost COMPONENTS algorithm filesystem json optional variant regex REQUIRED)
 find_package(fmt REQUIRED)
-find_package(rapidjson REQUIRED)
+find_package(RapidJSON REQUIRED)
 
-set(JINJA2_PRIVATE_LIBS_INT ${CONAN_BOOST_PACKAGE_NAME} fmt::fmt rapidjson::rapidjson nlohmann_json::nlohmann_json)
-set(JINJA2_PUBLIC_LIBS_INT nonstd::expected-lite nonstd::variant-lite nonstd::optional-lite nonstd::string-view-lite)
+set(JINJA2_PRIVATE_LIBS_INT Boost::headers Boost::filesystem)
+set(JINJA2_PUBLIC_LIBS_INT Boost::json fmt::fmt rapidjson Boost::regex
+    nlohmann_json::nlohmann_json nonstd::expected-lite nonstd::variant-lite nonstd::optional-lite nonstd::string-view-lite)
diff --git a/thirdparty/thirdparty-internal.cmake b/thirdparty/thirdparty-internal.cmake
@@ -12,13 +12,14 @@ list(APPEND BOOST_INCLUDE_LIBRARIES
     optional
     variant
     json
+    regex
 )
 
 include(FetchContent)
 FetchContent_Declare(
   Boost
   GIT_REPOSITORY https://github.com/boostorg/boost.git
-  GIT_TAG boost-1.82.0
+  GIT_TAG boost-1.83.0
   PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../cmake/patches/0001-fix-skip-install-rules.patch" || true
 )
 FetchContent_MakeAvailable(Boost)