diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch deleted file mode 100644 index b2f12e77025c..000000000000 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/cmake/AWSSDKConfig.cmake -+++ b/cmake/AWSSDKConfig.cmake -@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) - message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") - endif() - --# based on core header file path, inspects the actual AWSSDK_ROOT_DIR --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -- --if (NOT AWSSDK_ROOT_DIR) -- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") -+if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR}) -+ set(AWSSDK_ROOT_DIR "") -+else() -+ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ -+ if (NOT AWSSDK_ROOT_DIR) -+ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") -+ endif() - endif() - - -diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake -index 283a14a138..646aea1da3 100644 ---- a/cmake/utilities.cmake -+++ b/cmake/utilities.cmake -@@ -43,7 +43,8 @@ macro(setup_install) - EXPORT "${PROJECT_NAME}-targets" - ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY} - LIBRARY DESTINATION ${LIBRARY_DIRECTORY} -- RUNTIME DESTINATION ${BINARY_DIRECTORY} ) -+ RUNTIME DESTINATION ${BINARY_DIRECTORY} -+ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} ) - - if (BUILD_SHARED_LIBS) - install( -@@ -57,7 +58,8 @@ macro(setup_install) - install (TARGETS ${PROJECT_NAME} - ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} - LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} -- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) -+ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} -+ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) - endif() - endif() - endmacro() -diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in -index 9b519d2772..a61069225c 100644 ---- a/toolchains/pkg-config.pc.in -+++ b/toolchains/pkg-config.pc.in -@@ -1,5 +1,5 @@ --includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@ --libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@ -+includedir=@INCLUDE_DIRECTORY@ -+libdir=@LIBRARY_DIRECTORY@ - - Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ |