diff options
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch | 42 | ||||
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb | 1 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch b/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch new file mode 100644 index 0000000000..3e916a8081 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 905676309a407b9a50118b31370b73ec411a6f8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Marton Szasz <szaszm@apache.org> | ||
3 | Date: Mon, 31 Mar 2025 14:48:01 +0200 | ||
4 | Subject: [PATCH] MINIFICPP-2553 CMP0065=OLD removed in cmake 4.0, removed | ||
5 | override | ||
6 | |||
7 | Signed-off-by: Marton Szasz <szaszm@apache.org> | ||
8 | Signed-off-by: Gabor Gyimesi <gamezbird@gmail.com> | ||
9 | |||
10 | This closes #1957 | ||
11 | |||
12 | Upstream-Status: Backport [26aea0d8280986713b441cda3fd3858c80d21f65] | ||
13 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
14 | --- | ||
15 | CMakeLists.txt | 1 - | ||
16 | minifi_main/CMakeLists.txt | 1 - | ||
17 | 2 files changed, 2 deletions(-) | ||
18 | |||
19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
20 | index 70c94c2f..6673e331 100644 | ||
21 | --- a/CMakeLists.txt | ||
22 | +++ b/CMakeLists.txt | ||
23 | @@ -19,7 +19,6 @@ | ||
24 | |||
25 | cmake_minimum_required(VERSION 3.24) | ||
26 | cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK} | ||
27 | -cmake_policy(SET CMP0065 OLD) # default export policy, required for self-dlopen | ||
28 | cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted contents to the time of extraction | ||
29 | |||
30 | project(nifi-minifi-cpp VERSION 0.99.1) | ||
31 | diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt | ||
32 | index 62eb234f..1a2e9e0e 100644 | ||
33 | --- a/minifi_main/CMakeLists.txt | ||
34 | +++ b/minifi_main/CMakeLists.txt | ||
35 | @@ -69,7 +69,6 @@ target_link_libraries(minifiexe spdlog libsodium gsl-lite argparse ${LIBMINIFI}) | ||
36 | |||
37 | set_target_properties(minifiexe PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") | ||
38 | set_target_properties(minifiexe PROPERTIES OUTPUT_NAME minifi) | ||
39 | -set_target_properties(minifiexe PROPERTIES ENABLE_EXPORTS True) | ||
40 | if (WIN32) | ||
41 | target_compile_definitions(minifiexe PUBLIC SERVICE_NAME="Apache NiFi MINiFi") | ||
42 | endif() | ||
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb index 04f2488a61..16dc46275a 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb | |||
@@ -26,6 +26,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai | |||
26 | file://0005-generateVersion.sh-set-correct-buildrev.patch \ | 26 | file://0005-generateVersion.sh-set-correct-buildrev.patch \ |
27 | file://0006-CMakeLists.txt-do-not-use-ccache.patch \ | 27 | file://0006-CMakeLists.txt-do-not-use-ccache.patch \ |
28 | file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \ | 28 | file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \ |
29 | file://0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch \ | ||
29 | file://systemd-volatile.conf \ | 30 | file://systemd-volatile.conf \ |
30 | file://sysvinit-volatile.conf \ | 31 | file://sysvinit-volatile.conf \ |
31 | " | 32 | " |