From 66f35f8e025bb043de43ee47cb26f5cc9199f2d9 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Mon, 2 Oct 2023 17:57:12 +1000 Subject: [cmake] FindRapidJSON update to newer module standards --- .../rapidjson/002-cmake-removedocs-examples.patch | 28 ---------------------- .../002-cmake-standardise_config_installpath.patch | 15 ++++++++++++ .../rapidjson/003-cmake-removedocs-examples.patch | 28 ++++++++++++++++++++++ tools/depends/target/rapidjson/003-win-arm64.patch | 11 --------- tools/depends/target/rapidjson/004-win-arm64.patch | 11 +++++++++ tools/depends/target/rapidjson/Makefile | 10 ++++---- 6 files changed, 60 insertions(+), 43 deletions(-) delete mode 100644 tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch create mode 100644 tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch create mode 100644 tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch delete mode 100644 tools/depends/target/rapidjson/003-win-arm64.patch create mode 100644 tools/depends/target/rapidjson/004-win-arm64.patch (limited to 'tools') diff --git a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch b/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch deleted file mode 100644 index 4bf06da59c..0000000000 --- a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -134,14 +134,17 @@ - COMPONENT pkgconfig) - ENDIF() - -+if(RAPIDJSON_BUILD_DOC) - install(FILES readme.md - DESTINATION "${DOC_INSTALL_DIR}" - COMPONENT doc) -+endif() - - install(DIRECTORY include/rapidjson - DESTINATION "${INCLUDE_INSTALL_DIR}" - COMPONENT dev) - -+if(RAPIDJSON_BUILD_EXAMPLES) - install(DIRECTORY example/ - DESTINATION "${DOC_INSTALL_DIR}/examples" - COMPONENT examples -@@ -150,6 +153,7 @@ - PATTERN "CMakeFiles" EXCLUDE - PATTERN "Makefile" EXCLUDE - PATTERN "cmake_install.cmake" EXCLUDE) -+endif() - - # Provide config and version files to be used by other applications - # =============================== 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/003-cmake-removedocs-examples.patch b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch new file mode 100644 index 0000000000..4bf06da59c --- /dev/null +++ b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,14 +134,17 @@ + COMPONENT pkgconfig) + ENDIF() + ++if(RAPIDJSON_BUILD_DOC) + install(FILES readme.md + DESTINATION "${DOC_INSTALL_DIR}" + COMPONENT doc) ++endif() + + install(DIRECTORY include/rapidjson + DESTINATION "${INCLUDE_INSTALL_DIR}" + COMPONENT dev) + ++if(RAPIDJSON_BUILD_EXAMPLES) + install(DIRECTORY example/ + DESTINATION "${DOC_INSTALL_DIR}/examples" + COMPONENT examples +@@ -150,6 +153,7 @@ + PATTERN "CMakeFiles" EXCLUDE + PATTERN "Makefile" EXCLUDE + PATTERN "cmake_install.cmake" EXCLUDE) ++endif() + + # Provide config and version files to be used by other applications + # =============================== diff --git a/tools/depends/target/rapidjson/003-win-arm64.patch b/tools/depends/target/rapidjson/003-win-arm64.patch deleted file mode 100644 index 2d045dcaf6..0000000000 --- a/tools/depends/target/rapidjson/003-win-arm64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/rapidjson/rapidjson.h -+++ b/include/rapidjson/rapidjson.h -@@ -236,7 +236,7 @@ - # define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN - # elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) - # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN --# elif defined(_MSC_VER) && defined(_M_ARM) -+# elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64)) - # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN - # elif defined(RAPIDJSON_DOXYGEN_RUNNING) - # define RAPIDJSON_ENDIAN diff --git a/tools/depends/target/rapidjson/004-win-arm64.patch b/tools/depends/target/rapidjson/004-win-arm64.patch new file mode 100644 index 0000000000..2d045dcaf6 --- /dev/null +++ b/tools/depends/target/rapidjson/004-win-arm64.patch @@ -0,0 +1,11 @@ +--- a/include/rapidjson/rapidjson.h ++++ b/include/rapidjson/rapidjson.h +@@ -236,7 +236,7 @@ + # define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN + # elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN +-# elif defined(_MSC_VER) && defined(_M_ARM) ++# elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64)) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN + # elif defined(RAPIDJSON_DOXYGEN_RUNNING) + # define RAPIDJSON_ENDIAN 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) -- cgit v1.2.3