!26 fix install destination of executables for iOS/tvOS/watchOS

From: @Bolehu 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2023-08-01 12:00:36 +00:00 committed by Gitee
commit d6b82a9c74
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From e7bfb68e99905991cee97793d49d2acbc00829fa Mon Sep 17 00:00:00 2001
From: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
Date: Sun, 18 Jul 2021 22:33:06 +0200
Subject: [PATCH] fix install destination of executables for iOS/tvOS/watchOS
see https://cmake.org/cmake/help/latest/policy/CMP0006.html
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5d75b8a0..a0f53252 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ foreach(PROGRAM zipcmp zipmerge ziptool)
target_link_libraries(${PROGRAM} zip)
target_include_directories(${PROGRAM} PRIVATE BEFORE ${PROJECT_SOURCE_DIR}/lib ${PROJECT_BINARY_DIR})
if(LIBZIP_DO_INSTALL)
- install(TARGETS ${PROGRAM} EXPORT ${PROJECT_NAME}-targets RUNTIME DESTINATION bin)
+ install(TARGETS ${PROGRAM} EXPORT ${PROJECT_NAME}-targets DESTINATION bin)
endif()
if(NOT HAVE_GETOPT)
target_sources(${PROGRAM} PRIVATE getopt.c)
--
2.33.0

View File

@ -1,12 +1,13 @@
Name: libzip Name: libzip
Version: 1.8.0 Version: 1.8.0
Release: 3 Release: 4
Summary: A C library for reading, creating, and modifying zip archives Summary: A C library for reading, creating, and modifying zip archives
License: BSD License: BSD
URL: https://libzip.org/ URL: https://libzip.org/
Source0: https://libzip.org/download/libzip-%{version}.tar.xz Source0: https://libzip.org/download/libzip-%{version}.tar.xz
Patch6000: backport-Return-false-instead-of-1.patch Patch6000: backport-Return-false-instead-of-1.patch
Patch6001: backport-fix-install-destination-of-executables-for-iOS-tvOS-.patch
BuildRequires: gcc zlib-devel bzip2-devel openssl-devel cmake BuildRequires: gcc zlib-devel bzip2-devel openssl-devel cmake
BuildRequires: perl-interpreter perl(Cwd) perl(File::Copy) perl(File::Path) perl(Getopt::Long) BuildRequires: perl-interpreter perl(Cwd) perl(File::Copy) perl(File::Path) perl(Getopt::Long)
@ -74,6 +75,9 @@ make test
%changelog %changelog
* Tue Aug 1 2023 Bolehu <heyaohua@xfusion.com> - 1.8.0-4
- fix install destination of executables for iOS/tvOS/watchOS
* Mon Jul 31 2023 Bolehu <heyaohua@xfusion.com> - 1.8.0-3 * Mon Jul 31 2023 Bolehu <heyaohua@xfusion.com> - 1.8.0-3
- Return false instead of -1 - Return false instead of -1