From: Christophe Giboudeaux Subject: Fix cmake modules path in CMakeLists.txt Date: Wed Apr 3 11:20:27 UTC 2019 diff -Nru aws-c-event-stream-0.1.1.orig/CMakeLists.txt aws-c-event-stream-0.1.1/CMakeLists.txt --- aws-c-event-stream-0.1.1.orig/CMakeLists.txt 2019-01-05 02:14:32.000000000 +0100 +++ aws-c-event-stream-0.1.1/CMakeLists.txt 2019-04-09 12:52:27.628740293 +0200 @@ -13,13 +13,11 @@ cmake_minimum_required (VERSION 3.1) project (aws-c-event-stream C) -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}) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake") +include(GNUInstallDirs) include(AwsCFlags) include(AwsSharedLibSetup) @@ -71,9 +69,6 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0) set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable) -find_package(aws-c-common REQUIRED) -find_package(aws-checksums REQUIRED) - target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-common AWS::aws-checksums) aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME}) @@ -83,7 +78,7 @@ COMPONENT Development) install(EXPORT "${CMAKE_PROJECT_NAME}-targets" - DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/" + DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" NAMESPACE AWS:: COMPONENT Development) @@ -92,7 +87,7 @@ @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake" - DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/" + DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" COMPONENT Development)