c_cpp/aws-crt-cpp
SHA256
8
0
Fork 0
forked from pool/aws-crt-cpp
Code Pull Requests Activity

Accepting request 1035255 from home:glaubitz:branches:devel:libraries:c_c++

Browse Source 
- 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
This commit is contained in:
John Paul Adrian Glaubitz
2022-11-11 19:23:36 +00:00
committed by Git OBS Bridge
parent 7b19c20670
commit ca441ab686
5 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
acc_fix-cmake-modules-path.patch
View File

@@ -1,11 +1,11 @@
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 @@
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)
-if(UNIX AND NOT APPLE)
- include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(CMAKE_INSTALL_LIBDIR "lib")
@@ -13,28 +13,28 @@ diff -Nru aws-crt-cpp-0.18.3.orig/CMakeLists.txt aws-crt-cpp-0.18.3/CMakeLists.t
+find_package(aws-c-common REQUIRED)
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
set(FIND_LIBRARY_USE_LIB64_PATHS true)
@@ -340,7 +337,7 @@
@@ -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)
- 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 @@
@@ -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)
- 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)
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
COMPONENT Development)
if(NOT CMAKE_CROSSCOMPILING)