pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch

   1 --- a/cmake/AWSSDKConfig.cmake
   2 +++ b/cmake/AWSSDKConfig.cmake
   3 @@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE)
   4      message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first")
   5  endif()
   6
   7 -# based on core header file path, inspects the actual AWSSDK_ROOT_DIR
   8 -get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH)
   9 -get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  10 -get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  11 -get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  12 -
  13 -if (NOT AWSSDK_ROOT_DIR)
  14 -    message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file")
  15 +if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR})
  16 +    set(AWSSDK_ROOT_DIR "")
  17 +else()
  18 +    # based on core header file path, inspects the actual AWSSDK_ROOT_DIR
  19 +    get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH)
  20 +    get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  21 +    get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  22 +    get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH)
  23 +
  24 +    if (NOT AWSSDK_ROOT_DIR)
  25 +       message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file")
  26 +    endif()
  27  endif()
  28
  29
  30 diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake
  31 index 283a14a138..646aea1da3 100644
  32 --- a/cmake/utilities.cmake
  33 +++ b/cmake/utilities.cmake
  34 @@ -43,7 +43,8 @@ macro(setup_install)
  35                  EXPORT "${PROJECT_NAME}-targets"
  36                  ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}
  37                  LIBRARY DESTINATION ${LIBRARY_DIRECTORY}
  38 -                RUNTIME DESTINATION ${BINARY_DIRECTORY} )
  39 +                RUNTIME DESTINATION ${BINARY_DIRECTORY}
  40 +                INCLUDES DESTINATION ${INCLUDE_DIRECTORY} )
  41
  42          if (BUILD_SHARED_LIBS)
  43              install(
  44 @@ -57,7 +58,8 @@ macro(setup_install)
  45              install (TARGETS ${PROJECT_NAME}
  46                       ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
  47                       LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
  48 -                     RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME})
  49 +                     RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
  50 +                     INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME})
  51          endif()
  52      endif()
  53  endmacro()
  54 diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in
  55 index 9b519d2772..a61069225c 100644
  56 --- a/toolchains/pkg-config.pc.in
  57 +++ b/toolchains/pkg-config.pc.in
  58 @@ -1,5 +1,5 @@
  59 -includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@
  60 -libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@
  61 +includedir=@INCLUDE_DIRECTORY@
  62 +libdir=@LIBRARY_DIRECTORY@
  63
  64  Name: @PROJECT_NAME@
  65  Description: @PROJECT_DESCRIPTION@