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