Skip to content

Commit f90959c

Browse files
committed
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
1 parent 3d782f1 commit f90959c

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.23.0)
2-
project(Jinja2Cpp VERSION 1.2.2)
2+
project(Jinja2Cpp VERSION 1.3.0)
33

44
if (${CMAKE_VERSION} VERSION_GREATER "3.12")
55
cmake_policy(SET CMP0074 OLD)

conanfile.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[requires]
2+
boost/1.83.0
3+
expected-lite/0.6.3
4+
fmt/10.1.1
5+
nlohmann_json/3.11.2
6+
optional-lite/3.5.0
7+
rapidjson/cci.20220822
8+
string-view-lite/1.7.0
9+
variant-lite/2.0.0
10+
11+
[generators]
12+
CMakeDeps
13+
CMakeToolchain

thirdparty/gtest

Submodule gtest updated 144 files

thirdparty/thirdparty-conan-build.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ find_package(optional-lite REQUIRED)
66
find_package(string-view-lite REQUIRED)
77
find_package(nlohmann_json REQUIRED)
88

9-
find_package(Boost COMPONENTS algorithm filesystem json optional variant REQUIRED)
10-
set(CONAN_BOOST_PACKAGE_NAME Boost::boost)
9+
find_package(Boost COMPONENTS algorithm filesystem json optional variant regex REQUIRED)
1110
find_package(fmt REQUIRED)
12-
find_package(rapidjson REQUIRED)
11+
find_package(RapidJSON REQUIRED)
1312

14-
set(JINJA2_PRIVATE_LIBS_INT ${CONAN_BOOST_PACKAGE_NAME} fmt::fmt rapidjson::rapidjson nlohmann_json::nlohmann_json)
15-
set(JINJA2_PUBLIC_LIBS_INT nonstd::expected-lite nonstd::variant-lite nonstd::optional-lite nonstd::string-view-lite)
13+
set(JINJA2_PRIVATE_LIBS_INT Boost::headers Boost::filesystem)
14+
set(JINJA2_PUBLIC_LIBS_INT Boost::json fmt::fmt rapidjson Boost::regex
15+
nlohmann_json::nlohmann_json nonstd::expected-lite nonstd::variant-lite nonstd::optional-lite nonstd::string-view-lite)

thirdparty/thirdparty-internal.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ list(APPEND BOOST_INCLUDE_LIBRARIES
1212
optional
1313
variant
1414
json
15+
regex
1516
)
1617

1718
include(FetchContent)
1819
FetchContent_Declare(
1920
Boost
2021
GIT_REPOSITORY https://github.com/boostorg/boost.git
21-
GIT_TAG boost-1.82.0
22+
GIT_TAG boost-1.83.0
2223
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../cmake/patches/0001-fix-skip-install-rules.patch" || true
2324
)
2425
FetchContent_MakeAvailable(Boost)

0 commit comments

Comments
 (0)