8
0

Accepting request 734772 from home:glaubitz:branches:devel:libraries:c_c++

- Update to version 0.1.3
  + Added support for shared/static lib builds in the same build closure
- from version 0.1.2
  + Quote TO_CMAKE_PATH args
- Refresh patches for new version
  + aces_fix-cmake-modules-path.patch

OBS-URL: https://build.opensuse.org/request/show/734772
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-event-stream?expand=0&rev=5
This commit is contained in:
2019-10-03 10:57:09 +00:00
committed by Git OBS Bridge
parent b9aee5fb31
commit 52d0e6e73b
5 changed files with 29 additions and 29 deletions

View File

@@ -1,13 +1,9 @@
From: Christophe Giboudeaux <christophe@krop.fr>
Subject: Fix cmake modules path in CMakeLists.txt
Date: Wed Apr 3 11:20:27 UTC 2019
diff -Nru aws-c-event-stream-0.1.1.orig/CMakeLists.txt aws-c-event-stream-0.1.1/CMakeLists.txt
--- aws-c-event-stream-0.1.1.orig/CMakeLists.txt 2019-01-05 02:14:32.000000000 +0100
+++ aws-c-event-stream-0.1.1/CMakeLists.txt 2019-04-09 12:52:27.628740293 +0200
@@ -13,13 +13,11 @@
cmake_minimum_required (VERSION 3.1)
project (aws-c-event-stream C)
diff -Nru aws-c-event-stream-0.1.3.orig/CMakeLists.txt aws-c-event-stream-0.1.3/CMakeLists.txt
--- aws-c-event-stream-0.1.3.orig/CMakeLists.txt 2019-09-14 02:52:46.000000000 +0200
+++ aws-c-event-stream-0.1.3/CMakeLists.txt 2019-10-03 12:24:34.861135419 +0200
@@ -21,17 +21,11 @@
file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
endif()
-if (UNIX AND NOT APPLE)
- include(GNUInstallDirs)
@@ -18,31 +14,25 @@ diff -Nru aws-c-event-stream-0.1.1.orig/CMakeLists.txt aws-c-event-stream-0.1.1/
+find_package(aws-checksums REQUIRED)
+set(CMAKE_MODULE_PATH ${aws-c-common_DIR})
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake")
-# 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})
+include(GNUInstallDirs)
include(AwsCFlags)
include(AwsSharedLibSetup)
@@ -71,9 +69,6 @@
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
-find_package(aws-c-common REQUIRED)
-find_package(aws-checksums REQUIRED)
-
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-common AWS::aws-checksums)
aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
@@ -83,7 +78,7 @@
COMPONENT Development)
@@ -101,7 +95,7 @@
endif()
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}"
NAMESPACE AWS::
COMPONENT Development)
@@ -92,7 +87,7 @@
@@ -110,7 +104,7 @@
@ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Oct 3 10:28:51 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.1.3
+ Added support for shared/static lib builds in the same build closure
- from version 0.1.2
+ Quote TO_CMAKE_PATH args
- Refresh patches for new version
+ aces_fix-cmake-modules-path.patch
-------------------------------------------------------------------
Mon Apr 22 21:15:01 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@@ -18,7 +18,7 @@
%define library_version 1.0.0
%define library_soversion 0unstable
Name: aws-c-event-stream
Version: 0.1.1
Version: 0.1.3
Release: 0
Summary: C99 implementation of the vnd.amazon.eventstream content-type
License: Apache-2.0

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5ff7baa4bf90da1413ebed21edbc5b6c17bc13462036d128019886edac70ba5
size 27614

3
v0.1.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63d48b85dc7bad2a23c19e4bad456e171a7551dad158229de2da46aad60d5bb0
size 27945