forked from pool/aws-c-cal
Dirk Mueller
8c58203d34
* Fix heap use after free on aws_ecc_key_pair_new_from_asn1
by @TingDaoK in (#219)
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-cal?expand=0&rev=54
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
diff -Nru aws-c-cal-0.4.5.orig/CMakeLists.txt aws-c-cal-0.4.5/CMakeLists.txt
|
|
--- aws-c-cal-0.4.5.orig/CMakeLists.txt 2020-11-21 06:21:48.000000000 +0100
|
|
+++ aws-c-cal-0.4.5/CMakeLists.txt 2020-11-26 13:19:01.537346115 +0100
|
|
@@ -18,18 +18,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)
|
|
@@ -133,12 +127,12 @@
|
|
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)
|
|
|
|
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)
|
|
|
|
list(APPEND EXPORT_MODULES
|
|
@@ -146,7 +140,7 @@
|
|
)
|
|
|
|
install(FILES ${EXPORT_MODULES}
|
|
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/modules"
|
|
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/modules"
|
|
COMPONENT Development)
|
|
|
|
if (NOT CMAKE_CROSSCOMPILING AND NOT BYO_CRYPTO)
|