From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] package/rapidjson: switch to CMake
Date: Tue, 2 May 2017 22:51:59 +0200 [thread overview]
Message-ID: <20170502205235.CDF657FB5C@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=e810284ccb055dcab6dcf6abf41a15a77ee7888a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Upcoming Kodi v18 depends on RapidJSON and detects it by using pkg-conf:
https://github.com/xbmc/xbmc/blob/master/cmake/modules/FindRapidJSON.cmake#L13
Currently our package installs only the header files, but RapidJSON.pc
is also needed. Luckily this can be fixed by switching to CMake which
does the job, also add configure options to disable the CMake build of
executables.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/rapidjson/rapidjson.mk | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/package/rapidjson/rapidjson.mk b/package/rapidjson/rapidjson.mk
index d06f529..4d69bc3 100644
--- a/package/rapidjson/rapidjson.mk
+++ b/package/rapidjson/rapidjson.mk
@@ -13,8 +13,9 @@ RAPIDJSON_LICENSE_FILES = license.txt
RAPIDJSON_INSTALL_TARGET = NO
RAPIDJSON_INSTALL_STAGING = YES
-define RAPIDJSON_INSTALL_STAGING_CMDS
- cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include
-endef
+RAPIDJSON_CONF_OPTS = \
+ -DRAPIDJSON_BUILD_DOC=OFF \
+ -DRAPIDJSON_BUILD_EXAMPLES=OFF \
+ -DRAPIDJSON_BUILD_TESTS=OFF
-$(eval $(generic-package))
+$(eval $(cmake-package))
reply other threads:[~2017-05-02 20:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502205235.CDF657FB5C@busybox.osuosl.org \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox