SHA256
1
0
forked from pool/aws-crt-cpp
aws-crt-cpp/acc_fix-cmake-modules-path.patch

41 lines
1.4 KiB
Diff
Raw Normal View History

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)