forked from pool/aws-c-sdkutils
Accepting request 973724 from home:glaubitz:branches:devel:libraries:c_c++
- Initial build + Version 0.1.2 OBS-URL: https://build.opensuse.org/request/show/973724 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-sdkutils?expand=0&rev=1
This commit is contained in:
41
acs_fix-cmake-modules-path.patch
Normal file
41
acs_fix-cmake-modules-path.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
diff -Nru aws-c-sdkutils-0.1.2.orig/CMakeLists.txt aws-c-sdkutils-0.1.2/CMakeLists.txt
|
||||
--- aws-c-sdkutils-0.1.2.orig/CMakeLists.txt 2022-02-07 21:12:21.000000000 +0000
|
||||
+++ aws-c-sdkutils-0.1.2/CMakeLists.txt 2022-04-28 13:37:14.026977223 +0000
|
||||
@@ -16,18 +16,11 @@
|
||||
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()
|
||||
-
|
||||
-# 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})
|
||||
+find_package(aws-c-common REQUIRED)
|
||||
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
|
||||
+
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
include(AwsCFlags)
|
||||
include(AwsCheckHeaders)
|
||||
@@ -94,12 +87,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)
|
||||
|
||||
install(FILES ${EXPORT_MODULES}
|
||||
Reference in New Issue
Block a user