forked from pool/aws-crt-cpp
John Paul Adrian Glaubitz
1f56d5c22b
- Update to version 0.18.3 * Use latest versions of S2N-TLS and AWS-LC by @graebm in (#397) * Adds support for Anonymous credentials by @waahm7 in (#398) - from version 0.18.2 * Fix script that keeps AWS_CRT_CPP_VERSION up to date by @graebm in (#394) - from version 0.18.1 * Fix to cmake detection of CRT version by consumers by @sdavtaker in (#393) - from version 0.18.0 * Latest submodules by @TingDaoK in (#392) - Refresh patches for new version * acc_fix-cmake-modules-path.patch OBS-URL: https://build.opensuse.org/request/show/1001372 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-crt-cpp?expand=0&rev=4
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
diff -Nru aws-crt-cpp-0.18.3.orig/CMakeLists.txt aws-crt-cpp-0.18.3/CMakeLists.txt
|
|
--- aws-crt-cpp-0.18.3.orig/CMakeLists.txt 2022-08-25 01:22:44.000000000 +0000
|
|
+++ aws-crt-cpp-0.18.3/CMakeLists.txt 2022-09-06 07:07:36.220015929 +0000
|
|
@@ -48,11 +48,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)
|
|
@@ -340,7 +337,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)
|
|
|
|
@@ -359,11 +356,11 @@
|
|
)
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
|
COMPONENT Development)
|
|
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
|
COMPONENT Development)
|
|
|
|
|