diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-10-02 17:57:12 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-10-02 18:06:14 +1000 |
| commit | 66f35f8e025bb043de43ee47cb26f5cc9199f2d9 (patch) | |
| tree | e969d2d6597a5021c46ebc338f6741a5562691ee /tools | |
| parent | 0730dac071ab0b718d95e9b74a859a32358f9233 (diff) | |
[cmake] FindRapidJSON update to newer module standards
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch | 15 | ||||
| -rw-r--r-- | tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch (renamed from tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch) | 0 | ||||
| -rw-r--r-- | tools/depends/target/rapidjson/004-win-arm64.patch (renamed from tools/depends/target/rapidjson/003-win-arm64.patch) | 0 | ||||
| -rw-r--r-- | tools/depends/target/rapidjson/Makefile | 10 |
4 files changed, 21 insertions, 4 deletions
diff --git a/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch new file mode 100644 index 0000000000..937d19e8e3 --- /dev/null +++ b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,11 +94,7 @@ + SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install") + SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation") + +-IF(UNIX OR CYGWIN) +- SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") +-ELSEIF(WIN32) +- SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake") +-ENDIF() ++SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") + SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in") + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch index 4bf06da59c..4bf06da59c 100644 --- a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch +++ b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch diff --git a/tools/depends/target/rapidjson/003-win-arm64.patch b/tools/depends/target/rapidjson/004-win-arm64.patch index 2d045dcaf6..2d045dcaf6 100644 --- a/tools/depends/target/rapidjson/003-win-arm64.patch +++ b/tools/depends/target/rapidjson/004-win-arm64.patch diff --git a/tools/depends/target/rapidjson/Makefile b/tools/depends/target/rapidjson/Makefile index 233d3a3571..1e0a2d2e75 100644 --- a/tools/depends/target/rapidjson/Makefile +++ b/tools/depends/target/rapidjson/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.include include RAPIDJSON-VERSION DEPS = Makefile RAPIDJSON-VERSION 001-remove_custom_cxx_flags.patch ../../download-files.include \ - 002-cmake-removedocs-examples.patch \ - 003-win-arm64.patch + 002-cmake-standardise_config_installpath.patch \ + 003-cmake-removedocs-examples.patch \ + 004-win-arm64.patch CMAKE_OPTIONS=-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF @@ -42,8 +43,9 @@ endif cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build cd $(PLATFORM); patch -p1 -i ../001-remove_custom_cxx_flags.patch - cd $(PLATFORM); patch -p1 -i ../002-cmake-removedocs-examples.patch - cd $(PLATFORM); patch -p1 -i ../003-win-arm64.patch + cd $(PLATFORM); patch -p1 -i ../002-cmake-standardise_config_installpath.patch + cd $(PLATFORM); patch -p1 -i ../003-cmake-removedocs-examples.patch + cd $(PLATFORM); patch -p1 -i ../004-win-arm64.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. .installed-$(PLATFORM): $(PLATFORM) |