From 410bffafebbe36eb8f1302f50a08532768c9968a Mon Sep 17 00:00:00 2001 From: Tristan Walter <twalter@orn.mpg.de> Date: Tue, 13 Oct 2020 14:31:35 +0200 Subject: [PATCH] linux updates --- Application/CMakeLists.txt | 2 ++ Application/trex_build_unix.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt index 2613977..56080dd 100644 --- a/Application/CMakeLists.txt +++ b/Application/CMakeLists.txt @@ -827,6 +827,8 @@ if(${TREX_BUILD_OPENCV}) -DWITH_FFMPEG:BOOL=${WITH_FFMPEG} -DWITH_MSMF:BOOL=FALSE -DWITH_IPP:BOOL=FALSE + -DWITH_GTK:BOOL=FALSE + -DWITH_CAIRO:BOOL=FALSE -DWITH_PNG:BOOL=TRUE -DBUILD_PERF_TESTS:BOOL=FALSE -DBUILD_opencv_apps:BOOL=FALSE diff --git a/Application/trex_build_unix.sh b/Application/trex_build_unix.sh index 354cfd6..a267c20 100755 --- a/Application/trex_build_unix.sh +++ b/Application/trex_build_unix.sh @@ -60,9 +60,9 @@ if [ "$(uname)" == "Linux" ]; then -DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_FFMPEG=ON \ - -DTREX_BUILD_ZLIB=ON \ - -DTREX_BUILD_ZIP=ON \ - -DTREX_BUILD_PNG=ON \ + -DTREX_BUILD_ZLIB=OFF \ + -DTREX_BUILD_ZIP=OFF \ + -DTREX_BUILD_PNG=OFF \ -DCMAKE_PREFIX_PATH="$CONDA_PREFIX;$CONDA_PREFIX/lib/pkgconfig;$CONDA_PREFIX/lib" \ -DWITH_PYLON=ON else -- GitLab