Blame 0001-Allow-using-shared-minizip.patch
|
Mystro256 |
6cca5d8 |
From 9f12e0f5a9b282a92c8ee4e2fc4a94dc7a277bce Mon Sep 17 00:00:00 2001
|
|
Mystro256 |
6cca5d8 |
From: Mystro256 <alexjnewt@hotmail.com>
|
|
Mystro256 |
6cca5d8 |
Date: Wed, 11 Mar 2020 09:57:43 -0400
|
|
Mystro256 |
6cca5d8 |
Subject: [PATCH 1/2] Allow using shared minizip
|
|
Mystro256 |
6cca5d8 |
|
|
Mystro256 |
6cca5d8 |
---
|
|
Mystro256 |
6cca5d8 |
CMakeLists.txt | 10 ++++++++--
|
|
Mystro256 |
6cca5d8 |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
Mystro256 |
6cca5d8 |
|
|
Mystro256 |
6cca5d8 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
Mystro256 |
6cca5d8 |
index 02d6916d86..a46169b43c 100644
|
|
Mystro256 |
6cca5d8 |
--- a/CMakeLists.txt
|
|
Mystro256 |
6cca5d8 |
+++ b/CMakeLists.txt
|
|
Mystro256 |
6cca5d8 |
@@ -582,8 +582,14 @@ else()
|
|
Mystro256 |
6cca5d8 |
add_subdirectory(Externals/zlib)
|
|
Mystro256 |
6cca5d8 |
endif()
|
|
Mystro256 |
6cca5d8 |
|
|
Mystro256 |
6cca5d8 |
-add_subdirectory(Externals/minizip)
|
|
Mystro256 |
6cca5d8 |
-include_directories(External/minizip)
|
|
Mystro256 |
6cca5d8 |
+pkg_check_modules(MINIZIP minizip)
|
|
Mystro256 |
6cca5d8 |
+if(MINIZIP_FOUND)
|
|
Mystro256 |
6cca5d8 |
+ message(STATUS "Using shared minizip")
|
|
Mystro256 |
6cca5d8 |
+else()
|
|
Mystro256 |
6cca5d8 |
+ message(STATUS "Shared minizip not found, falling back to the static library")
|
|
Mystro256 |
6cca5d8 |
+ add_subdirectory(Externals/minizip)
|
|
Mystro256 |
6cca5d8 |
+ include_directories(External/minizip)
|
|
Mystro256 |
6cca5d8 |
+endif()
|
|
Mystro256 |
6cca5d8 |
|
|
Mystro256 |
6cca5d8 |
if(NOT APPLE)
|
|
Mystro256 |
6cca5d8 |
check_lib(LZO "(no .pc for lzo2)" lzo2 lzo/lzo1x.h QUIET)
|
|
Mystro256 |
6cca5d8 |
--
|
|
Mystro256 |
6cca5d8 |
2.21.1
|
|
Mystro256 |
6cca5d8 |
|