blob: f532f9f14fb19aea9684c1f4e491f79253f1b311 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From ac48075c5813f8ff2036aafddc0c391955ea36ae Mon Sep 17 00:00:00 2001
From: Jackey Lea <1768478912@qq.com>
Date: Wed, 23 Jul 2025 14:23:04 +0800
Subject: [PATCH] =?UTF-8?q?vcpkg=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CMakeLists.txt | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ada641..2aa5744 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,10 @@ ELSEIF(WITH_MINIZIP_NG)
SET(ANYZIP_LIBRARIES minizip${MINIZIP_NG_SUFFIX})
SET(ANYZIP_DEF USE_MINIZIP;USE_MINIZIP_NG)
ELSE()
- FIND_PACKAGE(Minizip REQUIRED)
+ FIND_PACKAGE(Minizip NAMES unofficial-minizip REQUIRED)
+ SET(MINIZIP_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+ SET(MINIZIP_LIBRARIES unofficial::minizip::minizip)
+ SET(ANYZIP_DEF USE_MINIZIP)
SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES})
SET(ANYZIP_DEF USE_MINIZIP)
@@ -68,7 +71,8 @@ IF(EXPAT_DIR)
FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
ELSE()
- FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(EXPAT NAMES expat REQUIRED)
+ SET(EXPAT_LIBRARIES expat::expat)
ENDIF()
# dependency: expatw (if wide library was requested)
IF(WITH_WIDE)
@@ -225,13 +229,13 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in"
IF (@WITH_LIBZIP@)
FIND_DEPENDENCY(LibZip)
ELSE()
- FIND_DEPENDENCY(minizip CONFIG)
+ FIND_DEPENDENCY(unofficial-minizip CONFIG)
ENDIF()
IF (@EXPAT_DIR@)
FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
ELSE()
- FIND_DEPENDENCY(EXPAT)
+ FIND_DEPENDENCY(expat CONFIG)
ENDIF()
IF(@WITH_WIDE@)
--
2.50.1.windows.1
|
