diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-08-21 11:51:58 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-08-21 13:15:39 -0700 |
| commit | ab52517b43720104fabc0020f2099156f3619d80 (patch) | |
| tree | c057772df88c8f1e52efe8e4576b70f2939d78d3 | |
| parent | 8e28287dde1627d09e5be8264d8552e0c9c4bab0 (diff) | |
| download | meta-openembedded-ab52517b43720104fabc0020f2099156f3619d80.tar.gz | |
rapidjson: Upgrade to tip of trunk
Fixes its cmake files to work with cmake4
consumed by other cmake based packages
Drop backport for CMake4 compatibility
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | 6 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index e40b9fe06c..0000000000 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From b855b1632f9afe5199e01d84da54068a4cb152a8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 8 Jul 2025 18:46:59 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | Fix: | ||
| 8 | |||
| 9 | | CMake Error at CMakeLists.txt:1 (CMAKE_MINIMUM_REQUIRED): | ||
| 10 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | | | ||
| 12 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 14 | | to work with policies introduced by <max> or earlier. | ||
| 15 | | | ||
| 16 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | | | ||
| 18 | | | ||
| 19 | | -- Configuring incomplete, errors occurred! | ||
| 20 | |||
| 21 | Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/ebd87cb468fb4cb060b37e579718c4a4125416c1] | ||
| 22 | |||
| 23 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 2 +- | ||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 27 | |||
| 28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 29 | index 3b9ac512..6d4121e9 100644 | ||
| 30 | --- a/CMakeLists.txt | ||
| 31 | +++ b/CMakeLists.txt | ||
| 32 | @@ -1,4 +1,4 @@ | ||
| 33 | -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) | ||
| 34 | +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) | ||
| 35 | if(POLICY CMP0025) | ||
| 36 | # detect Apple's Clang | ||
| 37 | cmake_policy(SET CMP0025 NEW) | ||
| 38 | -- | ||
| 39 | 2.43.0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 92858044c1..fa20b4d448 100644 --- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb | |||
| @@ -4,10 +4,8 @@ SECTION = "libs" | |||
| 4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
| 5 | LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" | 5 | LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https" |
| 8 | file://0001-allow-build-with-cmake-4.patch" | 8 | SRCREV = "24b5e7a8b27f42fa16b96fc70aade9106cf7102f" |
| 9 | |||
| 10 | SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" | ||
| 11 | 9 | ||
| 12 | PV = "1.1.0+git" | 10 | PV = "1.1.0+git" |
| 13 | 11 | ||
