File acc_fix-cmake-modules-path.patch of Package aws-crt-cpp

Overview Repositories Revisions Requests Users Attributes Meta

File acc_fix-cmake-modules-path.patch of Package aws-crt-cpp (Revision 2922e32f3fcd7d0cafc036a2ef06e056)

Currently displaying revision 2922e32f3fcd7d0cafc036a2ef06e056 , Show latest

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)

Places

File acc_fix-cmake-modules-path.patch of Package aws-crt-cpp (Revision 2922e32f3fcd7d0cafc036a2ef06e056)

Places