mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 19:14:30 +04:00
cf6b78846a
Add 2 pending patch to handle CMake 4.0 support. One comes from an open PR in the project [1]. The other is a downstream fix for trivial CMake warning. [1] https://github.com/lloyd/yajl/pull/256 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 8bbca6b9252c74129f3c721b0771c30ef36016fa Mon Sep 17 00:00:00 2001
|
|
From: Rudi Heitbaum <rudi@heitbaum.com>
|
|
Date: Fri, 28 Mar 2025 09:31:40 +0000
|
|
Subject: [PATCH] Allow build with CMake 4.0.0
|
|
|
|
fixes deprecated cmake option and uses cmake 2.8.0 TARGET_FILE
|
|
update cmake supported minimum versions to 2.8.0...3.10
|
|
|
|
ref:
|
|
- https://cmake.org/cmake/help/latest/policy/CMP0026.html
|
|
|
|
CMake Error at .../CMakeLists.txt: (GET_TARGET_PROPERTY):
|
|
The LOCATION property may not be read from target "json_...". Use the
|
|
target name directly with add_custom_command, or use the generator
|
|
expression $<TARGET_FILE>, as appropriate.
|
|
|
|
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
reformatter/CMakeLists.txt | 4 +---
|
|
verify/CMakeLists.txt | 4 +---
|
|
3 files changed, 3 insertions(+), 7 deletions(-)
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -12,7 +12,7 @@
|
|
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
|
|
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10)
|
|
|
|
PROJECT(YetAnotherJSONParser C)
|
|
|
|
--- a/reformatter/CMakeLists.txt
|
|
+++ b/reformatter/CMakeLists.txt
|
|
@@ -35,9 +35,7 @@ IF (NOT WIN32)
|
|
ENDIF (NOT WIN32)
|
|
|
|
# copy the binary into the output directory
|
|
-GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
|
|
-
|
|
ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
|
|
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
|
|
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_reformat> ${binDir})
|
|
|
|
INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
|
|
--- a/verify/CMakeLists.txt
|
|
+++ b/verify/CMakeLists.txt
|
|
@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS})
|
|
TARGET_LINK_LIBRARIES(json_verify yajl_s)
|
|
|
|
# copy in the binary
|
|
-GET_TARGET_PROPERTY(binPath json_verify LOCATION)
|
|
-
|
|
ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
|
|
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
|
|
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_verify> ${binDir})
|
|
|
|
INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)
|