File aces_fix-cmake-modules-path.patch of Package aws-c-event-stream

Overview Repositories Revisions Requests Users Attributes Meta

File aces_fix-cmake-modules-path.patch of Package aws-c-event-stream (Revision 0decb29ca3862297f3b653ec33185a46)

Currently displaying revision 0decb29ca3862297f3b653ec33185a46 , Show latest

diff -Nru aws-c-event-stream-0.1.6.orig/CMakeLists.txt aws-c-event-stream-0.1.6/CMakeLists.txt
--- aws-c-event-stream-0.1.6.orig/CMakeLists.txt	2020-07-24 02:06:45.000000000 +0200
+++ aws-c-event-stream-0.1.6/CMakeLists.txt	2020-08-25 13:17:04.469790864 +0200
@@ -11,17 +11,11 @@
     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)
+find_package(aws-checksums REQUIRED)
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
 
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+include(GNUInstallDirs)
 
 include(AwsCFlags)
 include(AwsSharedLibSetup)
@@ -92,7 +86,7 @@
 endif()
 
 install(EXPORT "${PROJECT_NAME}-targets"
-    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+    DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/"
     NAMESPACE AWS::
     COMPONENT Development)
 
@@ -101,7 +95,7 @@
     @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
+    DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
     COMPONENT Development)

Places

File aces_fix-cmake-modules-path.patch of Package aws-c-event-stream (Revision 0decb29ca3862297f3b653ec33185a46)

Places