Skip to content

Commit d24ef88

Browse files
hwangsihuhwangsihu
committed
Some dependency changes and updates
- Update ZLib to 1.3.2 - Remove and replace non-working build options - Remove unused dependency features
1 parent ad9dd07 commit d24ef88

7 files changed

Lines changed: 44 additions & 33 deletions

File tree

‎Library/TeamTalkLib/build/catch2/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if (MSVC)
1818
PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/0001-Enable-Runtime-Library-option-MT-for-MSVC.patch
1919
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/catch2
2020
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
21-
-DBUILD_TESTING=OFF
2221
-DCATCH_INSTALL_DOCS=OFF
22+
-DCATCH_INSTALL_EXTRAS=OFF
2323
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Debug
2424
COMMAND ${CMAKE_COMMAND} --build . --config Release
2525
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_CATCH2}
@@ -64,8 +64,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
6464
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
6565
-DCMAKE_OSX_ARCHITECTURES=${ARCHS}
6666
-DCMAKE_BUILD_TYPE=release
67-
-DBUILD_TESTING=OFF
6867
-DCATCH_INSTALL_DOCS=OFF
68+
-DCATCH_INSTALL_EXTRAS=OFF
6969
BUILD_COMMAND ${CMAKE_COMMAND} --build .
7070
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libCatch2.a <INSTALL_DIR>/lib/libCatch2Main.a
7171
)
@@ -108,8 +108,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
108108
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_CATCH2}
109109
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
110110
${CATCH2_CFG_FLAGS}
111-
-DBUILD_TESTING=OFF
112111
-DCATCH_INSTALL_DOCS=OFF
112+
-DCATCH_INSTALL_EXTRAS=OFF
113113
BUILD_COMMAND ${CMAKE_COMMAND} --build .
114114
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libCatch2.a <INSTALL_DIR>/lib/libCatch2Main.a
115115
)
@@ -145,8 +145,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
145145
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
146146
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
147147
-DCMAKE_BUILD_TYPE=release
148-
-DBUILD_TESTING=OFF
149148
-DCATCH_INSTALL_DOCS=OFF
149+
-DCATCH_INSTALL_EXTRAS=OFF
150150
BUILD_COMMAND ${CMAKE_COMMAND} --build .
151151
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libCatch2.a <INSTALL_DIR>/lib/libCatch2Main.a
152152
)
@@ -186,8 +186,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
186186
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
187187
${CATCH2_CFG_FLAGS}
188188
-DCMAKE_BUILD_TYPE=release
189-
-DBUILD_TESTING=OFF
190189
-DCATCH_INSTALL_DOCS=OFF
190+
-DCATCH_INSTALL_EXTRAS=OFF
191191
BUILD_COMMAND ${CMAKE_COMMAND} --build .
192192
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libCatch2.a <INSTALL_DIR>/lib/libCatch2Main.a
193193
)

‎Library/TeamTalkLib/build/ogg/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if (MSVC)
1717
UPDATE_COMMAND ""
1818
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ogg
1919
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
20+
-DINSTALL_DOCS=OFF
21+
-DINSTALL_PKG_CONFIG_MODULE=OFF
2022
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target ogg --config Debug
2123
COMMAND ${CMAKE_COMMAND} --build . --target ogg --config Release
2224
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OGG}
@@ -52,6 +54,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
5254
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ogg
5355
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OGG}
5456
CMAKE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_OSX_ARCHITECTURES=${ARCHS} -DCMAKE_BUILD_TYPE=release
57+
-DINSTALL_DOCS=OFF
58+
-DINSTALL_PKG_CONFIG_MODULE=OFF
5559
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target ogg
5660
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libogg.a
5761
)
@@ -88,6 +92,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
8892
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ogg
8993
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OGG}
9094
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${OGG_CFG_FLAGS}
95+
-DINSTALL_DOCS=OFF
96+
-DINSTALL_PKG_CONFIG_MODULE=OFF
9197
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target ogg
9298
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libogg.a
9399
)
@@ -116,6 +122,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
116122
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ogg
117123
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OGG}
118124
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=release
125+
-DINSTALL_DOCS=OFF
126+
-DINSTALL_PKG_CONFIG_MODULE=OFF
119127
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target ogg
120128
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libogg.a
121129
)
@@ -148,6 +156,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
148156
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ogg
149157
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OGG}
150158
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${OGG_CFG_FLAGS} -DCMAKE_BUILD_TYPE=release
159+
-DINSTALL_DOCS=OFF
160+
-DINSTALL_PKG_CONFIG_MODULE=OFF
151161
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target ogg
152162
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libogg.a
153163
)

‎Library/TeamTalkLib/build/openssl/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
7474
UPDATE_COMMAND ""
7575
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/openssl-intel
7676
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPENSSL}-intel
77-
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> darwin64-x86_64-cc -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}
77+
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> no-tests no-apps no-docs darwin64-x86_64-cc -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}
7878
BUILD_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS}
79-
INSTALL_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS} install_sw install_ssldirs
79+
INSTALL_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS} install
8080
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcrypto.a <INSTALL_DIR>/lib/libssl.a
8181
)
8282
ExternalProject_Get_Property(openssl-intel-src INSTALL_DIR)
@@ -90,9 +90,9 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
9090
UPDATE_COMMAND ""
9191
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/openssl-arm64
9292
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPENSSL}-arm64
93-
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> darwin64-arm64-cc -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}
93+
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> no-tests no-apps no-docs darwin64-arm64-cc -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}
9494
BUILD_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS}
95-
INSTALL_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS} install_sw install_ssldirs
95+
INSTALL_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS} install
9696
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcrypto.a <INSTALL_DIR>/lib/libssl.a
9797
)
9898
ExternalProject_Get_Property(openssl-arm64-src INSTALL_DIR)
@@ -159,7 +159,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
159159
UPDATE_COMMAND ""
160160
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/openssl
161161
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPENSSL}
162-
CONFIGURE_COMMAND ${OPENSSL_CFG_PREFIX} && export CFLAGS=-arch\ ${CMAKE_OSX_ARCHITECTURES} && <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> ${OPENSSL_CFG_TARGET} no-shared no-async no-tests ${OPENSSL_CFG_POSTFIX}
162+
CONFIGURE_COMMAND ${OPENSSL_CFG_PREFIX} && export CFLAGS=-arch\ ${CMAKE_OSX_ARCHITECTURES} && <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> ${OPENSSL_CFG_TARGET} no-shared no-async no-tests no-apps no-docs ${OPENSSL_CFG_POSTFIX}
163163
BUILD_COMMAND ${OPENSSL_CFG_PREFIX} && make ${TOOLCHAIN_BUILD_MAKEJOBS}
164164
INSTALL_COMMAND ${OPENSSL_CFG_PREFIX} && make ${TOOLCHAIN_BUILD_MAKEJOBS} install
165165
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcrypto.a <INSTALL_DIR>/lib/libssl.a
@@ -197,7 +197,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
197197
UPDATE_COMMAND ""
198198
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/openssl
199199
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPENSSL}
200-
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> -DPIC -fPIC linux-x86_64
200+
CONFIGURE_COMMAND <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> -DPIC -fPIC no-tests no-apps no-docs linux-x86_64
201201
BUILD_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS}
202202
INSTALL_COMMAND make ${TOOLCHAIN_BUILD_MAKEJOBS} install
203203
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcrypto.a <INSTALL_DIR>/lib/libssl.a
@@ -253,7 +253,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
253253
UPDATE_COMMAND ""
254254
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/openssl
255255
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPENSSL}
256-
CONFIGURE_COMMAND ${OPENSSL_EXPORT} && <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> -DPIC -fPIC no-shared
256+
CONFIGURE_COMMAND ${OPENSSL_EXPORT} && <SOURCE_DIR>/Configure --prefix=<INSTALL_DIR> -DPIC -fPIC no-shared no-tests no-apps no-docs
257257
${OPENSSL_CFG_TARGET} -D__ANDROID_API__=${ANDROID_PLATFORM_LEVEL}
258258
BUILD_COMMAND ${OPENSSL_EXPORT} && make ${TOOLCHAIN_BUILD_MAKEJOBS}
259259
INSTALL_COMMAND ${OPENSSL_EXPORT} && make ${TOOLCHAIN_BUILD_MAKEJOBS} install

‎Library/TeamTalkLib/build/openssl/build-openssl-win.bat_sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
SET PATH=@NASM_EXE_DIRECTORY_NATIVE@;%PATH%
22
SET CL=/MP
3-
perl Configure --prefix=@OPENSSL_INSTALL_DIR@ --openssldir=@OPENSSL_INSTALL_DIR@\ssl no-shared @OPENSSL_TARGET@
3+
perl Configure --prefix=@OPENSSL_INSTALL_DIR@ --openssldir=@OPENSSL_INSTALL_DIR@\ssl no-shared no-tests no-apps no-docs @OPENSSL_TARGET@
44
nmake /s

‎Library/TeamTalkLib/build/opus/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if (MSVC)
1717
UPDATE_COMMAND ""
1818
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/opus
1919
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DOPUS_STATIC_RUNTIME=ON
20+
-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF
21+
-DOPUS_INSTALL_CMAKE_CONFIG_MODULE=OFF
2022
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target opus --config Debug
2123
COMMAND ${CMAKE_COMMAND} --build . --target opus --config Release
2224
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPUS}
@@ -52,6 +54,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
5254
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/opus
5355
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPUS}
5456
CMAKE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_OSX_ARCHITECTURES=${ARCHS} -DCMAKE_BUILD_TYPE=release
57+
-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=OFF
5558
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target opus
5659
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libopus.a
5760
)
@@ -91,6 +94,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")
9194
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/opus
9295
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPUS}
9396
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${OPUS_CFG_FLAGS}
97+
-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=OFF
9498
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target opus
9599
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libopus.a
96100
)
@@ -125,6 +129,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
125129
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/opus
126130
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPUS}
127131
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=release ${OPUS_CFG_FLAGS}
132+
-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=OFF
128133
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target opus
129134
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libopus.a
130135
)
@@ -165,6 +170,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
165170
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/opus
166171
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_OPUS}
167172
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=ON ${OPUS_CFG_FLAGS} -DCMAKE_BUILD_TYPE=release
173+
-DOPUS_INSTALL_PKG_CONFIG_MODULE=OFF -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=OFF
168174
BUILD_COMMAND ${CMAKE_COMMAND} --build . --target opus
169175
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libopus.a
170176
)

‎Library/TeamTalkLib/build/tinyxml2/CMakeLists.txt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ if (MSVC)
2727
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/tinyxml2
2828
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
2929
-DCMAKE_DEBUG_POSTFIX=d
30-
-DBUILD_SHARED_LIBS=OFF
31-
-DBUILD_TESTING=OFF
3230
-Dtinyxml2_INSTALL_PKGCONFIG=OFF
3331
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Debug
3432
COMMAND ${CMAKE_COMMAND} --build . --config Release
@@ -67,8 +65,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
6765
-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
6866
-DCMAKE_OSX_ARCHITECTURES=${ARCHS}
6967
-DCMAKE_BUILD_TYPE=release
70-
-DBUILD_SHARED_LIBS=OFF
71-
-DBUILD_TESTING=OFF
68+
-Dtinyxml2_INSTALL_PKGCONFIG=OFF
7269
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_TINYXML2}
7370
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libtinyxml2.a
7471
)
@@ -97,8 +94,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
9794
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/tinyxml2
9895
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
9996
-DCMAKE_BUILD_TYPE=release
100-
-DBUILD_SHARED_LIBS=OFF
101-
-DBUILD_TESTING=OFF
97+
-Dtinyxml2_INSTALL_PKGCONFIG=OFF
10298
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_TINYXML2}
10399
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libtinyxml2.a
104100
)
@@ -132,8 +128,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
132128
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
133129
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
134130
-DANDROID_ABI=${ANDROID_ABI} -DANDROID_PLATFORM=${ANDROID_PLATFORM}
135-
-DBUILD_SHARED_LIBS=OFF
136-
-DBUILD_TESTING=OFF
131+
-Dtinyxml2_INSTALL_PKGCONFIG=OFF
137132
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_TINYXML2}
138133
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libtinyxml2.a
139134
)

‎Library/TeamTalkLib/build/zlib/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,33 @@ if (MSVC)
2323

2424
ExternalProject_Add(zlib-src
2525
GIT_REPOSITORY https://github.com/madler/zlib.git
26-
GIT_TAG v1.3.1
26+
GIT_TAG v1.3.2
2727
UPDATE_COMMAND ""
2828
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/zlib
2929
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_ZLIB}
3030
SOURCE_SUBDIR .
3131
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
32-
-DCMAKE_BUILD_TYPE=Release
33-
-DBUILD_SHARED_LIBS=OFF
32+
-DZLIB_BUILD_TESTING=OFF
33+
-DZLIB_BUILD_SHARED=OFF
3434
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release
3535
INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release --target install
36-
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/zlibstatic.lib
36+
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/zs.lib
3737
)
3838
else()
3939

4040
ExternalProject_Add(zlib-src
4141
GIT_REPOSITORY https://github.com/madler/zlib.git
42-
GIT_TAG v1.3.1
42+
GIT_TAG v1.3.2
4343
UPDATE_COMMAND ""
4444
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/zlib
4545
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_ZLIB}
4646
SOURCE_SUBDIR .
4747
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
48-
-DCMAKE_BUILD_TYPE=Release
49-
-DBUILD_SHARED_LIBS=OFF
48+
-DZLIB_BUILD_TESTING=OFF
49+
-DZLIB_BUILD_SHARED=OFF
5050
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release
5151
INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release --target install
52-
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/zlibstatic.lib
52+
BUILD_BYPRODUCTS <INSTALL_DIR>/lib/zs.lib
5353
)
5454
endif()
5555
ExternalProject_Get_Property(zlib-src INSTALL_DIR)
@@ -64,15 +64,15 @@ if (MSVC)
6464
endif()
6565
target_include_directories (zlib INTERFACE ${INSTALL_DIR}/include)
6666
set_target_properties(zlib PROPERTIES
67-
IMPORTED_LOCATION_DEBUG ${INSTALL_DIR}/lib/zlibstatic.lib
68-
IMPORTED_LOCATION ${INSTALL_DIR}/lib/zlibstatic.lib)
67+
IMPORTED_LOCATION_DEBUG ${INSTALL_DIR}/lib/zs.lib
68+
IMPORTED_LOCATION ${INSTALL_DIR}/lib/zs.lib)
6969

7070
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
7171

7272
if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
7373
ExternalProject_Add(zlib-src
7474
GIT_REPOSITORY https://github.com/madler/zlib.git
75-
GIT_TAG v1.3.1
75+
GIT_TAG v1.3.2
7676
GIT_SHALLOW TRUE
7777
UPDATE_COMMAND ""
7878
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/zlib
@@ -102,7 +102,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
102102
if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
103103
ExternalProject_Add(zlib-src
104104
GIT_REPOSITORY https://github.com/madler/zlib.git
105-
GIT_TAG v1.3.1
105+
GIT_TAG v1.3.2
106106
GIT_SHALLOW TRUE
107107
UPDATE_COMMAND ""
108108
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/zlib

0 commit comments

Comments
 (0)