diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-01-08 08:11:25 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-01-08 10:47:44 +1000 |
| commit | beac53ed3807f97957d7d20759067b0fe4426dcf (patch) | |
| tree | 54dd81bf129f7918d142aafdea7c2a304b939695 | |
| parent | fd9016ab9fa458d1c008e19c184a857db74cfe9f (diff) | |
[cmake] Module rapidjson use VERSION helper
| -rw-r--r-- | cmake/modules/FindRapidJSON.cmake | 9 | ||||
| -rw-r--r-- | tools/depends/target/rapidjson/Makefile | 9 | ||||
| -rw-r--r-- | tools/depends/target/rapidjson/RAPIDJSON-VERSION | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake index a21ed0bdc5..7a1168b17f 100644 --- a/cmake/modules/FindRapidJSON.cmake +++ b/cmake/modules/FindRapidJSON.cmake @@ -10,15 +10,16 @@ # if(ENABLE_INTERNAL_RapidJSON) include(ExternalProject) - file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/rapidjson/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$") - string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" RJSON_VER "${VER}") + include(cmake/scripts/common/ModuleHelpers.cmake) + + get_archive_name(rapidjson) # allow user to override the download URL with a local tarball # needed for offline build envs if(RapidJSON_URL) get_filename_component(RapidJSON_URL "${RapidJSON_URL}" ABSOLUTE) else() - set(RapidJSON_URL http://mirrors.kodi.tv/build-deps/sources/rapidjson-${RJSON_VER}.tar.gz) + set(RapidJSON_URL http://mirrors.kodi.tv/build-deps/sources/${ARCHIVE}) endif() if(VERBOSE) message(STATUS "RapidJSON_URL: ${RapidJSON_URL}") @@ -48,7 +49,7 @@ if(ENABLE_INTERNAL_RapidJSON) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(rapidjson REQUIRED_VARS RapidJSON_LIBRARY RapidJSON_INCLUDE_DIR - VERSION_VAR RJSON_VER) + VERSION_VAR RAPIDJSON_VER) set(RapidJSON_LIBRARIES ${RapidJSON_LIBRARY}) set(RapidJSON_INCLUDE_DIRS ${RapidJSON_INCLUDE_DIR}) diff --git a/tools/depends/target/rapidjson/Makefile b/tools/depends/target/rapidjson/Makefile index 0939ed5757..a93e1b030f 100644 --- a/tools/depends/target/rapidjson/Makefile +++ b/tools/depends/target/rapidjson/Makefile @@ -1,11 +1,6 @@ -include ../../Makefile.include -DEPS = Makefile 0001-remove_custom_cxx_flags.patch - -# lib name, version -LIBNAME=rapidjson -VERSION=1.1.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz +include RAPIDJSON-VERSION +DEPS = Makefile RAPIDJSON-VERSION 0001-remove_custom_cxx_flags.patch CMAKE_OPTIONS=-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF diff --git a/tools/depends/target/rapidjson/RAPIDJSON-VERSION b/tools/depends/target/rapidjson/RAPIDJSON-VERSION new file mode 100644 index 0000000000..8440f69ac0 --- /dev/null +++ b/tools/depends/target/rapidjson/RAPIDJSON-VERSION @@ -0,0 +1,3 @@ +LIBNAME=rapidjson +VERSION=1.1.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz |