forked from pool/aws-c-compression
Compare commits
11 Commits
Author | SHA256 | Date | |
---|---|---|---|
667ceff5a4 | |||
517108e3a4 | |||
6d4e21ccdf | |||
5b84f6329c | |||
c167c73c89 | |||
9ae46bba9d | |||
80c3055e14 | |||
186ab276b9 | |||
428adb3802 | |||
df3787b3f6 | |||
3e2cb55582 |
@@ -1,44 +0,0 @@
|
||||
diff -Nru aws-c-compression-0.2.14.orig/CMakeLists.txt aws-c-compression-0.2.14/CMakeLists.txt
|
||||
--- aws-c-compression-0.2.14.orig/CMakeLists.txt 2021-07-19 16:32:41.000000000 +0000
|
||||
+++ aws-c-compression-0.2.14/CMakeLists.txt 2021-10-11 10:20:05.895902762 +0000
|
||||
@@ -13,17 +13,12 @@
|
||||
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)
|
||||
+find_package(aws-checksums REQUIRED)
|
||||
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
||||
|
||||
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
|
||||
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
|
||||
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
|
||||
-# Append that generated list to the module search path
|
||||
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
|
||||
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
include(AwsCFlags)
|
||||
include(AwsCheckHeaders)
|
||||
@@ -88,7 +83,7 @@
|
||||
endif()
|
||||
|
||||
install(EXPORT "${PROJECT_NAME}-targets"
|
||||
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/"
|
||||
NAMESPACE AWS::
|
||||
COMPONENT Development)
|
||||
|
||||
@@ -97,7 +92,7 @@
|
||||
@ONLY)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
||||
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
|
||||
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
|
||||
COMPONENT Development)
|
||||
|
||||
option(BUILD_HUFFMAN_GENERATOR "Whether or not to build the aws-c-common-huffman-generator tool" OFF)
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:517c361f3b7fffca08efd5ad251a20489794f056eab0dfffacc6d5b341df8e86
|
||||
size 36050
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7e5d7308d1dbb1801eae9356ef65558f707edf33660dd6443c985db9474725eb
|
||||
size 36423
|
Reference in New Issue
Block a user