forked from pool/aws-c-io
Accepting request 1224186 from home:glaubitz:branches:devel:libraries:c_c++
- Update to version 0.15.3 * Event loop public api by @bretambrose in (#691) * Add ML-KEM Support by @alexw91 in (#693) * Update checksum based on previous PR changes by @bretambrose in (#695) * Add an option to disable retries by @waahm7 in (#694) OBS-URL: https://build.opensuse.org/request/show/1224186 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-io?expand=0&rev=76
This commit is contained in:
42
aci_fix-cmake-modules-path.patch
Normal file
42
aci_fix-cmake-modules-path.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
diff -Nru aws-c-io-0.7.0.orig/CMakeLists.txt aws-c-io-0.7.0/CMakeLists.txt
|
||||
--- aws-c-io-0.7.0.orig/CMakeLists.txt 2020-11-20 01:33:59.000000000 +0100
|
||||
+++ aws-c-io-0.7.0/CMakeLists.txt 2020-11-24 12:38:44.025900582 +0100
|
||||
@@ -14,18 +14,8 @@
|
||||
file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
|
||||
endif()
|
||||
|
||||
-
|
||||
-if (UNIX AND NOT APPLE)
|
||||
- include(GNUInstallDirs)
|
||||
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
||||
- set(CMAKE_INSTALL_LIBDIR "lib")
|
||||
-endif()
|
||||
-
|
||||
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
|
||||
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
|
||||
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
|
||||
-# Append that generated list to the module search path
|
||||
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
|
||||
+find_package(aws-c-common REQUIRED)
|
||||
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
||||
|
||||
include(AwsCFlags)
|
||||
include(AwsCheckHeaders)
|
||||
@@ -217,7 +207,7 @@
|
||||
endif()
|
||||
|
||||
install(EXPORT "${PROJECT_NAME}-targets"
|
||||
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/"
|
||||
NAMESPACE AWS::
|
||||
COMPONENT Development)
|
||||
|
||||
@@ -226,7 +216,7 @@
|
||||
@ONLY)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
||||
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
||||
COMPONENT Development)
|
||||
|
||||
if (NOT CMAKE_CROSSCOMPILING)
|
||||
Reference in New Issue
Block a user