diff --git a/0001-change-external-project-to-local-package.patch b/0001-change-external-project-to-local-package.patch index 151054d01ad53648f9552a66f0580d0e6bdfbcbe..da9b9e1565d43ed0a1c311fbde754c0de98eddb7 100644 --- a/0001-change-external-project-to-local-package.patch +++ b/0001-change-external-project-to-local-package.patch @@ -40,18 +40,19 @@ diff --git a/third_party/nlohmann_json/CMakeLists.txt b/third_party/nlohmann_jso index c4ec891..7e57f1d 100644 --- a/third_party/nlohmann_json/CMakeLists.txt +++ b/third_party/nlohmann_json/CMakeLists.txt -@@ -9,13 +9,9 @@ else () +@@ -9,13 +9,9 @@ include(ExternalProject) ExternalProject_Add(nlohmann_json_dependency URL - https://github.com/nlohmann/json/archive/v3.10.5.tar.gz -+ ${DEPEND_PATH}/json-3.10.5.tar.gz ++ ${DEPEND_PATH}/json-3.11.3.tar.gz URL_HASH - MD5=5b946f7d892fa55eabec45e76a20286b +- MD5=5b946f7d892fa55eabec45e76a20286b - DOWNLOAD_NO_PROGRESS - 1 - UPDATE_COMMAND - "" ++ MD5=d603041cbc6051edbaa02ebb82cf0aa9 LOG_CONFIGURE 1 LOG_BUILD diff --git a/Bear.spec b/Bear.spec index 969c40eefad9563dff5b5aa692e8f17cd4a4de4d..1e29cd5132179e6e118a2da72c3ef7c23b1381e6 100644 --- a/Bear.spec +++ b/Bear.spec @@ -11,14 +11,14 @@ %bcond_with tests Name: Bear Version: 3.0.20 -Release: 5 +Release: 6 Summary: Tool to generate compilation database for clang tooling License: GPL-3.0-or-later URL: https://github.com/rizsotto/Bear Source0: %{name}-%{version}.tar.gz Source1: googletest-release-1.12.1.tar.gz Source2: fmt-9.0.0.tar.gz -Source3: json-3.10.5.tar.gz +Source3: json-3.11.3.tar.gz Source4: spdlog-1.10.0.tar.gz BuildRequires: bash-completion BuildRequires: gcc, gcc-c++, make @@ -88,6 +88,9 @@ rm -rf %{buildroot}%{_datadir}/doc %{_libdir}/bear/ %changelog +* Sun Mar 02 2025 Funda Wang - 3.0.20-6 +- update json third_party dependencies for build with cmake 4.0 + * Wed Nov 13 2024 Funda Wang - 3.0.20-5 - adopt to new cmake macro diff --git a/json-3.10.5.tar.gz b/json-3.11.3.tar.gz similarity index 47% rename from json-3.10.5.tar.gz rename to json-3.11.3.tar.gz index 3c106def5b9b7a4c01f66a823c18261982836952..c66a790230d35748e84f9aa32c28b85e7c3c43a3 100644 Binary files a/json-3.10.5.tar.gz and b/json-3.11.3.tar.gz differ