forked from pool/aws-crt-cpp
John Paul Adrian Glaubitz
ca441ab686
- Update to version 0.18.13 * Fix C++ One Definition Rule (ODR) Violations by @graebm in (#426) - from version 0.18.12 * Fixed missing new header in the installation destination - from version 0.18.11 * Update aws-c-sdkutils to v0.1.6 - from version 0.18.10 * Added Raspberry support for Github Action by @xiazhvera in (#415) * Endpoint resolution engine bindings by @DmitriyMusatkin in (#419) * Remove unused variable by @DmitriyMusatkin in (#420) - from version 0.18.9 * Version fix by @TingDaoK in (#412) OBS-URL: https://build.opensuse.org/request/show/1035255 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-crt-cpp?expand=0&rev=6
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
diff -Nru aws-crt-cpp-0.18.13.orig/CMakeLists.txt aws-crt-cpp-0.18.13/CMakeLists.txt
|
|
--- aws-crt-cpp-0.18.13.orig/CMakeLists.txt 2022-11-09 04:52:33.000000000 +0000
|
|
+++ aws-crt-cpp-0.18.13/CMakeLists.txt 2022-11-11 12:51:50.150393984 +0000
|
|
@@ -60,11 +60,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)
|
|
@@ -360,7 +357,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)
|
|
|
|
@@ -376,11 +373,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)
|
|
|
|
if(NOT CMAKE_CROSSCOMPILING)
|