Compare commits
2 Commits
Author | SHA256 | Date | |
---|---|---|---|
6bf30e3414 | |||
1099401865 |
18
rapidjson-additional-cmake4.patch
Normal file
18
rapidjson-additional-cmake4.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
--- a/RapidJSONConfig.cmake.in 2021-10-15 08:34:41.000000000 +0200
|
||||
+++ b/RapidJSONConfig.cmake.in 2025-04-21 13:30:18.525986832 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
# CMake minimum version required
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
################################################################################
|
||||
# RapidJSON source dir
|
||||
--- a/example/CMakeLists.txt 2021-10-15 08:34:41.000000000 +0200
|
||||
+++ b/example/CMakeLists.txt 2025-04-21 13:26:53.763332803 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
if(POLICY CMP0054)
|
||||
cmake_policy(SET CMP0054 NEW)
|
48
rapidjson-cmake4.patch
Normal file
48
rapidjson-cmake4.patch
Normal file
@@ -0,0 +1,48 @@
|
||||
|
||||
github.com/Tencent/rapidjson/issues/2159
|
||||
github.com/Tencent/rapidjson/pull/2250
|
||||
github.com/Tencent/rapidjson/commit/ebd87cb
|
||||
|
||||
adapted to opensuse source tree ("2.8" instead of "2.8.12")
|
||||
|
||||
|
||||
From ebd87cb468fb4cb060b37e579718c4a4125416c1 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Fersch <git@chron.visiondesigns.de>
|
||||
Date: Mon, 15 Jan 2024 07:44:16 +0100
|
||||
Subject: [PATCH] Increase CMake minimum version to 3.5 (fixes #2159)
|
||||
|
||||
---
|
||||
CMakeLists.txt | 16 ++--------------
|
||||
1 file changed, 2 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1b3a79de9..c02301c98 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,11 +1,4 @@
|
||||
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
|
||||
-if(POLICY CMP0025)
|
||||
- # detect Apple's Clang
|
||||
- cmake_policy(SET CMP0025 NEW)
|
||||
-endif()
|
||||
-if(POLICY CMP0054)
|
||||
- cmake_policy(SET CMP0054 NEW)
|
||||
-endif()
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
|
||||
|
||||
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
|
||||
|
||||
@@ -14,12 +7,7 @@ set(LIB_MINOR_VERSION "1")
|
||||
set(LIB_PATCH_VERSION "0")
|
||||
set(LIB_VERSION_STRING "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION}")
|
||||
|
||||
-if (CMAKE_VERSION VERSION_LESS 3.0)
|
||||
- PROJECT(RapidJSON CXX)
|
||||
-else()
|
||||
- cmake_policy(SET CMP0048 NEW)
|
||||
- PROJECT(RapidJSON VERSION "${LIB_VERSION_STRING}" LANGUAGES CXX)
|
||||
-endif()
|
||||
+PROJECT(RapidJSON VERSION "${LIB_VERSION_STRING}" LANGUAGES CXX)
|
||||
|
||||
# compile in release with debug info mode by default
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 16 13:52:41 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
|
||||
|
||||
- Add rapidjson-cmake4.patch from upstream to fix cmake-4 build
|
||||
failure
|
||||
- Add rapidjson-additional-cmake4.patch to fix
|
||||
cmake_minimum_required in the packaged RapidJSONConfig.cmake
|
||||
and to fix another build failure
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 14 21:24:15 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
@@ -24,6 +24,8 @@ License: MIT
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: http://rapidjson.org/
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Patch1: rapidjson-cmake4.patch
|
||||
Patch2: rapidjson-additional-cmake4.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig
|
||||
@@ -55,7 +57,7 @@ RapidJSON is a header-only JSON parser and generator for C++.
|
||||
This package contains development headers and examples.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1
|
||||
sed -i -e 's:-Werror::g' CMakeLists.txt
|
||||
|
||||
%build
|
||||
|
Reference in New Issue
Block a user