From 05a111ef328d70ef0ca5e485f608e1f5823b6ed9 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Sat, 10 Oct 2020 13:26:39 +0200
Subject: [PATCH] this as well
---
Application/CMakeLists.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index 1aff9a9..23af8ab 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -786,13 +786,11 @@ if(${TREX_BUILD_OPENCV})
-DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/zlibd.lib
-DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/zlib.lib)
else()
- if(APPLE)
- set(OPENCV_EXTRA_FLAGS_ ${OPENCV_EXTRA_FLAGS_}
- -DZLIB_INCLUDE_DIR:PATH=${zlib_install_dir}/include
- -DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/libz.a
- -DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/libzd.a
- )
- endif()
+ set(OPENCV_EXTRA_FLAGS_ ${OPENCV_EXTRA_FLAGS_}
+ -DZLIB_INCLUDE_DIR:PATH=${zlib_install_dir}/include
+ -DZLIB_LIBRARY_RELEASE:FILEPATH=${zlib_install_dir}/lib/libz.a
+ -DZLIB_LIBRARY_DEBUG:FILEPATH=${zlib_install_dir}/lib/libzd.a
+ )
endif()
endif()
set(OPENCV_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--
GitLab