Skip to content

Commit 0163e94

Browse files
authored
vs opencv build zlib test (#520)
1 parent b6289dc commit 0163e94

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

apothecary/formulas/opencv/opencv.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ function build() {
298298
-DWITH_OPENCL_SVM=OFF \
299299
-DWITH_LAPACK=OFF \
300300
-DBUILD_ZLIB=ON \
301-
-DWITH_ZLIB=OFF \
301+
-DWITH_ZLIB=ON \
302302
-DWITH_DIRECTX=ON \
303303
-DWITH_MSMF=ON \
304304
-DWITH_DSHOW=ON \
@@ -378,9 +378,6 @@ function build() {
378378
-DCMAKE_SYSTEM_PROCESSOR="${PLATFORM}" \
379379
${EXTRA_DEFS} \
380380
${CMAKE_WIN_SDK} \
381-
-DZLIB_ROOT=${ZLIB_ROOT} \
382-
-DZLIB_LIBRARY=${ZLIB_LIBRARY} \
383-
-DZLIB_INCLUDE_DIRS=${ZLIB_INCLUDE_DIR} \
384381
-DBUILD_PNG=OFF \
385382
-DPNG_ROOT=${LIBPNG_ROOT} \
386383
-DPNG_PNG_INCLUDE_DIR=${LIBPNG_INCLUDE_DIR} \
@@ -415,9 +412,6 @@ function build() {
415412
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} ${EXCEPTION_FLAGS}" \
416413
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} ${EXCEPTION_FLAGS}" \
417414
${EXTRA_DEFS} \
418-
-DZLIB_ROOT=${ZLIB_ROOT} \
419-
-DZLIB_LIBRARY=${ZLIB_LIBRARY} \
420-
-DZLIB_INCLUDE_DIRS=${ZLIB_INCLUDE_DIR} \
421415
-DBUILD_PNG=OFF \
422416
-DPNG_ROOT=${LIBPNG_ROOT} \
423417
-DPNG_PNG_INCLUDE_DIR=${LIBPNG_INCLUDE_DIR} \

0 commit comments

Comments
 (0)