mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

rapidjson: fix cmake artifacts installation for non-default BASELIB case

Browse Source 
If BASELIB is set to non-default value (like lib64),
next 'installed but not shipped' issue happens:
  /usr/lib
  /usr/lib/cmake
  /usr/lib/pkgconfig
  /usr/lib/cmake/RapidJSON
  /usr/lib/cmake/RapidJSON/RapidJSONConfigVersion.cmake
  /usr/lib/cmake/RapidJSON/RapidJSONConfig.cmake
  /usr/lib/pkgconfig/RapidJSON.pc

This is because rapidjson has library installation dir set
to 'lib' by default and hardcoded in another place.
Fix this by next changes:
 - set appropriate LIB_INSTALL_DIR
 - fix hardcoded 'lib' in CMAKECONFIG_INSTALL_DIR case

Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ruslan Bilovol
2019-02-07 13:00:01 +02:00
committed by Khem Raj
parent c245374faf
commit 2e0fd78621
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+3 -2
View File
@@ -4,7 +4,8 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1"
SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1 \
file://0001-CMake-remove-hardcoded-CMAKECONFIG_INSTALL_DIR-path.patch"
SRCREV = "6a905f9311f82d306da77bd963ec5aa5da07da9c"
@@ -14,7 +15,7 @@ S = "${WORKDIR}/git"
inherit cmake
EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF"
EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}"
# RapidJSON is a header-only C++ library, so the main package will be empty.