mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
json-schema-validator: Remove absolute path in INSTALL_CMAKE_DIR
Can't found properly in the sysroot dir due to the absolute path in INSTALL_CMAKE_DIR. Fixes: The imported target "nlohmann_json_schema_validator" references the file "/usr/lib/libnlohmann_json_schema_validator.so.2.1.0" but this file does not exist. Signed-off-by: Youngseok Jeong <youngseok1.jeong@lge.com> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
committed by
Gyorgy Sarvari
parent
28798fac9f
commit
1289dd19f7
+45
@@ -0,0 +1,45 @@
|
|||||||
|
From 63ddedc5ed9702ea3966243cc33992339cdbf71c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Youngseok Jeong <youngseok1.jeong@lge.com>
|
||||||
|
Date: Thu, 21 Aug 2025 19:17:22 +0900
|
||||||
|
Subject: [PATCH] Do not use the CMAKE_INSTALL_PREFIX
|
||||||
|
|
||||||
|
Remove absolute path in INSTALL_CMAKE_DIR for fixing sysroot path issue.
|
||||||
|
This issue is resolved v2.2.0 which is in scarthgap but backport patch
|
||||||
|
is not matched well in kirkstone branch.
|
||||||
|
|
||||||
|
See patch:
|
||||||
|
https://github.com/pboettch/json-schema-validator/pull/121/commits/1cdca2a64d6e15e9d3191cc175053b08095a74fa
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [kirkstone specific]
|
||||||
|
|
||||||
|
Signed-off-by: Youngseok Jeong <youngseok1.jeong@lge.com>
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 8 +-------
|
||||||
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 594dc5f..676071a 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -157,7 +157,7 @@ if(JSON_VALIDATOR_INSTALL)
|
||||||
|
# Set Up the Project Targets and Config Files for CMake
|
||||||
|
|
||||||
|
# Set the install path to the cmake config files
|
||||||
|
- set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||||
|
+ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
||||||
|
|
||||||
|
# Create the ConfigVersion file
|
||||||
|
include(CMakePackageConfigHelpers) # write_basic_package_version_file
|
||||||
|
@@ -165,12 +165,6 @@ if(JSON_VALIDATOR_INSTALL)
|
||||||
|
VERSION ${PACKAGE_VERSION}
|
||||||
|
COMPATIBILITY SameMajorVersion)
|
||||||
|
|
||||||
|
- # Get the relative path from the INSTALL_CMAKE_DIR to the include directory
|
||||||
|
- file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/include")
|
||||||
|
-
|
||||||
|
-
|
||||||
|
- # Configure the Config.cmake file with the proper include directory
|
||||||
|
- set(CONF_INCLUDE_DIRS "\${JSON_SCHEMA_VALIDATOR_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
||||||
|
configure_file(${PROJECT_NAME}Config.cmake.in
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)
|
||||||
|
|
||||||
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006"
|
|||||||
|
|
||||||
SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https \
|
SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https \
|
||||||
file://0001-cmake-Use-GNUInstallDirs.patch \
|
file://0001-cmake-Use-GNUInstallDirs.patch \
|
||||||
|
file://0002-Do-not-use-the-CMAKE_INSTALL_PREFIX.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "27fc1d094503623dfe39365ba82581507524545c"
|
SRCREV = "27fc1d094503623dfe39365ba82581507524545c"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user