forked from pool/aws-crt-cpp
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
diff -Nru aws-crt-cpp-0.17.1.orig/CMakeLists.txt aws-crt-cpp-0.17.1/CMakeLists.txt
|
||
|
|
--- aws-crt-cpp-0.17.1.orig/CMakeLists.txt 2021-09-30 22:46:57.000000000 +0000
|
||
|
|
+++ aws-crt-cpp-0.17.1/CMakeLists.txt 2021-10-12 09:21:56.938935370 +0000
|
||
|
|
@@ -48,11 +48,8 @@
|
||
|
|
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)
|
||
|
|
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
||
|
|
|
||
|
|
if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
|
||
|
|
set(FIND_LIBRARY_USE_LIB64_PATHS true)
|
||
|
|
@@ -338,7 +335,7 @@
|
||
|
|
endif()
|
||
|
|
|
||
|
|
install(EXPORT "${PROJECT_NAME}-targets"
|
||
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
||
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/"
|
||
|
|
NAMESPACE AWS::
|
||
|
|
COMPONENT Development)
|
||
|
|
|
||
|
|
@@ -347,7 +344,7 @@
|
||
|
|
@ONLY)
|
||
|
|
|
||
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
||
|
|
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
|
||
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
||
|
|
COMPONENT Development)
|
||
|
|
|
||
|
|
if (NOT CMAKE_CROSSCOMPILING)
|