forked from pool/aws-crt-cpp
Dirk Mueller
a496bd63ee
* Temporarily rollback s2n by @DmitriyMusatkin in (#705) - from version 0.30.0 * Add topic argument to publish callback in request-response stream client by @sfod in (#703) * CMake modules by @sfod in #702 - from version 0.29.10 * Fix segfaults -- CRC64NVME on machines with disabled AVX and uri parsing corner case. by @TingDaoK in (#700) - Drop acc_fix-cmake-modules-path.patch, fixed upstream OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-crt-cpp?expand=0&rev=78
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
diff -Nru aws-crt-cpp-0.24.7.orig/CMakeLists.txt aws-crt-cpp-0.24.7/CMakeLists.txt
|
|
--- aws-crt-cpp-0.24.7.orig/CMakeLists.txt 2023-11-13 20:37:29.000000000 +0100
|
|
+++ aws-crt-cpp-0.24.7/CMakeLists.txt 2023-11-21 12:51:17.191157144 +0100
|
|
@@ -39,11 +39,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()
|
|
+find_package(aws-c-common REQUIRED)
|
|
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
|
|
|
if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
|
|
set(FIND_LIBRARY_USE_LIB64_PATHS true)
|
|
@@ -348,7 +345,7 @@
|
|
endif()
|
|
|
|
install(EXPORT "${PROJECT_NAME}-targets"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/"
|
|
NAMESPACE AWS::
|
|
COMPONENT Development)
|
|
|
|
@@ -364,11 +361,11 @@
|
|
)
|
|
|
|
install(FILES "${GENERATED_ROOT_DIR}/${PROJECT_NAME}-config.cmake"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
|
COMPONENT Development)
|
|
|
|
install(FILES "${GENERATED_ROOT_DIR}/${PROJECT_NAME}-config-version.cmake"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
|
COMPONENT Development)
|
|
|
|
if(NOT CMAKE_CROSSCOMPILING)
|