aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
diff options
context:
space:
mode:
authorRuslan Bilovol <rbilovol@cisco.com>2019-02-07 13:00:01 +0200
committerKhem Raj <raj.khem@gmail.com>2019-02-07 10:06:29 -0800
commit2e0fd78621b05acb6df58adf910373a8814b70a1 (patch)
treedbf98a7d15c3c9f9a9a149e054cf1fa568914d48 /meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
parentc245374fafbc4769e0c98ae18ac9ff71f9f14169 (diff)
downloadmeta-openembedded-2e0fd78621b05acb6df58adf910373a8814b70a1.tar.gz
meta-openembedded-2e0fd78621b05acb6df58adf910373a8814b70a1.tar.bz2
meta-openembedded-2e0fd78621b05acb6df58adf910373a8814b70a1.zip
rapidjson: fix cmake artifacts installation for non-default BASELIB case
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>
Diffstat (limited to 'meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb')
-rw-r--r--meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index c90eab043..e3ed9c6a1 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -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.