forked from pool/aws-c-mqtt
- Update to version 0.13.2
* Remove Windows 2019 and add Windows 2025 with MSVC-17
by @TingDaoK in (#401)
* Log ack_timeout_seconds by @sbSteveK in (#402)
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-mqtt?expand=0&rev=53
This commit is contained in:
44
acm_fix-cmake-modules-path.patch
Normal file
44
acm_fix-cmake-modules-path.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
diff -Nru aws-c-mqtt-0.7.0.orig/CMakeLists.txt aws-c-mqtt-0.7.0/CMakeLists.txt
|
||||
--- aws-c-mqtt-0.7.0.orig/CMakeLists.txt 2021-03-15 22:34:10.000000000 +0000
|
||||
+++ aws-c-mqtt-0.7.0/CMakeLists.txt 2021-12-09 12:36:06.541491345 +0000
|
||||
@@ -15,17 +15,12 @@
|
||||
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()
|
||||
+find_package(aws-c-common REQUIRED)
|
||||
+find_package(aws-checksums REQUIRED)
|
||||
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
||||
|
||||
-# 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})
|
||||
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
include(AwsCFlags)
|
||||
include(AwsCheckHeaders)
|
||||
@@ -94,7 +89,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)
|
||||
|
||||
@@ -103,7 +98,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)
|
||||
|
||||
include(CTest)
|
||||
Reference in New Issue
Block a user