From 0662d9abb64ad27e6d23e74db766f4b38bfe7a7f Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Tue, 15 Feb 2022 14:04:44 +0800 Subject: [PATCH] hiredis: install cmake module to lib/cmake/hiredis. (#1002) --- packages/h/hiredis/patches/v1.0.2/cmake.patch | 11 ++++++++++- packages/h/hiredis/xmake.lua | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/h/hiredis/patches/v1.0.2/cmake.patch b/packages/h/hiredis/patches/v1.0.2/cmake.patch index 2989e8af1..4cfc20203 100644 --- a/packages/h/hiredis/patches/v1.0.2/cmake.patch +++ b/packages/h/hiredis/patches/v1.0.2/cmake.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f86c9b7..b545e21 100644 +index f86c9b7..55ae30b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,9 @@ @@ -116,6 +116,15 @@ index f86c9b7..b545e21 100644 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hiredis.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +@@ -72,7 +127,7 @@ export(EXPORT hiredis-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/hiredis-targets.cmake" + NAMESPACE hiredis::) + +-SET(CMAKE_CONF_INSTALL_DIR share/hiredis) ++SET(CMAKE_CONF_INSTALL_DIR lib/cmake/hiredis) + SET(INCLUDE_INSTALL_DIR include) + include(CMakePackageConfigHelpers) + configure_package_config_file(hiredis-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/hiredis-config.cmake @@ -95,10 +150,12 @@ IF(ENABLE_SSL) ENDIF() ENDIF() diff --git a/packages/h/hiredis/xmake.lua b/packages/h/hiredis/xmake.lua index 11550743c..95d88c02a 100644 --- a/packages/h/hiredis/xmake.lua +++ b/packages/h/hiredis/xmake.lua @@ -9,7 +9,7 @@ package("hiredis") add_versions('v1.0.2', 'e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819') -- This patch is created with hiredis commit f8de9a4. Removed NuGet related install code. -- We need latest CMakeLists.txt to get static library support. It also contains other fixes. - add_patches("v1.0.2", path.join(os.scriptdir(), "patches", "v1.0.2", "cmake.patch"), "d75d3034cc5d487440d7bc24a3a2229a433351639848562e2416461ede4f428f") + add_patches("v1.0.2", path.join(os.scriptdir(), "patches", "v1.0.2", "cmake.patch"), "a2115f727821e4a121e4e2145ef3e5caa0669559f24f2213125119520ee4d881") add_configs("openssl", {description = "with openssl library", default = false, type = "boolean"})