diff --git a/CMakeLists.txt b/CMakeLists.txt index 0be3083..971be48 100644 --- 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 new file mode 100644 index 0000000..1c661f7 --- /dev/null +++ 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 index a0b8a92..f5e5435 160000 --- a/thirdparty/fmtlib +++ b/thirdparty/fmtlib @@ -1 +1 @@ -Subproject commit a0b8a92e3d1532361c2f7feb63babc5c18d00ef2 +Subproject commit f5e54359df4c26b6230fc61d38aa294581393084 diff --git a/thirdparty/gtest b/thirdparty/gtest index b796f7d..f8d7d77 160000 --- a/thirdparty/gtest +++ b/thirdparty/gtest @@ -1 +1 @@ -Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1 +Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 diff --git a/thirdparty/json/rapid b/thirdparty/json/rapid index 973dc9c..f9d5341 160000 --- a/thirdparty/json/rapid +++ b/thirdparty/json/rapid @@ -1 +1 @@ -Subproject commit 973dc9c06dcd3d035ebd039cfb9ea457721ec213 +Subproject commit f9d53419e912910fd8fa57d5705fa41425428c35 diff --git a/thirdparty/nonstd/expected-lite b/thirdparty/nonstd/expected-lite index 49af05a..45a54fa 160000 --- a/thirdparty/nonstd/expected-lite +++ b/thirdparty/nonstd/expected-lite @@ -1 +1 @@ -Subproject commit 49af05a2fdda423f8aa3918c2b96ccfa1857c3dd +Subproject commit 45a54fac224e5aae5f8e70bb1c2423181ae554da diff --git a/thirdparty/thirdparty-conan-build.cmake b/thirdparty/thirdparty-conan-build.cmake index e465b68..773cb87 100644 --- 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 index 11de37e..9f17c1f 100644 --- 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)