forked from pool/aws-c-compression
Dirk Mueller
8bd01b2a13
* chore: Modified bug issue template to add checkbox to
report potential regression. by @ashishdhingra in (#69)
* Switch CI to use roles by @DmitriyMusatkin in #71
* A bunch of CMake fixes by @graebm in #72
- Drop acc_fix-cmake-modules-path.patch, fixed upstream
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-compression?expand=0&rev=11
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
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)
|