From e810284ccb055dcab6dcf6abf41a15a77ee7888a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Apr 2017 01:05:32 +0200 Subject: [PATCH] package/rapidjson: switch to CMake 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 Signed-off-by: Thomas Petazzoni --- 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 d06f52962e..4d69bc3450 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)) -- 2.30.2