Skip to content

Commit 34cd17a

Browse files
committed
For windows, move x64 msvc zlib binary to appropriate directory, add arm64 msvc zlib binary and remove mingw zlib binary
1 parent 0323cd5 commit 34cd17a

File tree

18 files changed

+2493
-4
lines changed

18 files changed

+2493
-4
lines changed

CMakeLists.txt

+10-4
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,17 @@ find_package(QT NAMES Qt6 REQUIRED COMPONENTS ${qtComponents})
4141
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${qtComponents})
4242

4343
if(MSVC_TOOLSET_VERSION EQUAL 142)
44-
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019/zlib")
44+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
45+
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019-arm64/zlib")
46+
else()
47+
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2019-x64/zlib")
48+
endif()
4549
elseif(MSVC_TOOLSET_VERSION EQUAL 143)
46-
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022/zlib")
47-
elseif(MINGW)
48-
list(APPEND CMAKE_PREFIX_PATH "windows/mingw64/zlib")
50+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
51+
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022-arm64/zlib")
52+
else()
53+
list(APPEND CMAKE_PREFIX_PATH "windows/msvc2022-x64/zlib")
54+
endif()
4955
endif()
5056
find_package(ZLIB REQUIRED)
5157

windows/mingw64/lib/libz.a

-106 KB
Binary file not shown.
File renamed without changes.
748 KB
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)