mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
221eefaf6b
This package had two patches (with two headers etc.) in one file, which would have quilt merging them during a refresh. Separate these patches into two files, as the original intent seems to be having them separate. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
101 lines
1.4 KiB
Diff
101 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8e75f66..24d7329 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -95,34 +95,67 @@ set(ZLIB_PUBLIC_HDRS
|
|
${CMAKE_CURRENT_BINARY_DIR}/zconf.h
|
|
zlib.h
|
|
)
|
|
-set(ZLIB_PRIVATE_HDRS
|
|
- crc32.h
|
|
- deflate.h
|
|
- gzguts.h
|
|
- inffast.h
|
|
- inffixed.h
|
|
- inflate.h
|
|
- inftrees.h
|
|
- trees.h
|
|
- zutil.h
|
|
-)
|
|
-set(ZLIB_SRCS
|
|
- adler32.c
|
|
- compress.c
|
|
- crc32.c
|
|
- deflate.c
|
|
- gzclose.c
|
|
- gzlib.c
|
|
- gzread.c
|
|
- gzwrite.c
|
|
- inflate.c
|
|
- infback.c
|
|
- inftrees.c
|
|
- inffast.c
|
|
- trees.c
|
|
- uncompr.c
|
|
- zutil.c
|
|
-)
|
|
+
|
|
+if(ARMv8)
|
|
+ set(ZLIB_PRIVATE_HDRS
|
|
+ crc32.h
|
|
+ deflate.h
|
|
+ gzguts.h
|
|
+ inffast.h
|
|
+ inffixed.h
|
|
+ inflate.h
|
|
+ inftrees.h
|
|
+ trees.h
|
|
+ zutil.h
|
|
+ contrib/arm/chunkcopy.h
|
|
+ )
|
|
+ set(ZLIB_SRCS
|
|
+ adler32.c
|
|
+ compress.c
|
|
+ crc32.c
|
|
+ deflate.c
|
|
+ gzclose.c
|
|
+ gzlib.c
|
|
+ gzread.c
|
|
+ gzwrite.c
|
|
+ infback.c
|
|
+ inftrees.c
|
|
+ contrib/arm/inflate.c
|
|
+ contrib/arm/inffast.c
|
|
+ trees.c
|
|
+ uncompr.c
|
|
+ zutil.c
|
|
+ )
|
|
+ else()
|
|
+ set(ZLIB_PRIVATE_HDRS
|
|
+ crc32.h
|
|
+ deflate.h
|
|
+ gzguts.h
|
|
+ inffast.h
|
|
+ inffixed.h
|
|
+ inflate.h
|
|
+ inftrees.h
|
|
+ trees.h
|
|
+ zutil.h
|
|
+ )
|
|
+ set(ZLIB_SRCS
|
|
+ adler32.c
|
|
+ compress.c
|
|
+ crc32.c
|
|
+ deflate.c
|
|
+ gzclose.c
|
|
+ gzlib.c
|
|
+ gzread.c
|
|
+ gzwrite.c
|
|
+ inflate.c
|
|
+ infback.c
|
|
+ inftrees.c
|
|
+ inffast.c
|
|
+ trees.c
|
|
+ uncompr.c
|
|
+ zutil.c
|
|
+ )
|
|
+endif()
|
|
|
|
if(NOT MINGW)
|
|
set(ZLIB_DLL_SRCS
|