From f37a897d4244e98daa75a92fe4a829a913714572 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Mon, 15 Apr 2019 10:20:13 +0300
Subject: [PATCH] Remove zlib dependency
---
CMakeLists.txt | 2 +-
reconstruct/CMakeLists.txt | 2 +-
reconstruct/src/main.cpp | 2 +-
vision/CMakeLists.txt | 2 +-
vision/src/streamer.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3b98409..5d5a06e10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package( Threads REQUIRED )
find_package( URIParser REQUIRED )
find_package( MsgPack REQUIRED )
find_package( LibSGM )
-find_package( ZLIB REQUIRED )
+#find_package( ZLIB REQUIRED )
# Readline library is not required on Windows
# May also entirely remove dependence on this... it should be optional at least.
diff --git a/reconstruct/CMakeLists.txt b/reconstruct/CMakeLists.txt
index 78ce7d52c..3d851d469 100644
--- a/reconstruct/CMakeLists.txt
+++ b/reconstruct/CMakeLists.txt
@@ -12,6 +12,6 @@ add_dependencies(ftl-reconstruct ftlnet)
add_dependencies(ftl-reconstruct ftlcommon)
#target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(ftl-reconstruct ftlcommon Threads::Threads ZLIB::ZLIB ${OpenCV_LIBS} glog::glog ftlnet ftlrender)
+target_link_libraries(ftl-reconstruct ftlcommon Threads::Threads ${OpenCV_LIBS} glog::glog ftlnet ftlrender)
diff --git a/reconstruct/src/main.cpp b/reconstruct/src/main.cpp
index 02f915a93..51c346da2 100644
--- a/reconstruct/src/main.cpp
+++ b/reconstruct/src/main.cpp
@@ -7,7 +7,7 @@
#include <glog/logging.h>
#include <ftl/config.h>
#include <ftl/configuration.hpp>
-#include <zlib.h>
+// #include <zlib.h>
// #include <lz4.h>
#include <string>
diff --git a/vision/CMakeLists.txt b/vision/CMakeLists.txt
index a0cc3f6b9..5320fd283 100644
--- a/vision/CMakeLists.txt
+++ b/vision/CMakeLists.txt
@@ -47,6 +47,6 @@ set_property(TARGET ftl-vision PROPERTY CUDA_SEPARABLE_COMPILATION ON)
endif()
#target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(ftl-vision ftlcommon ftlrender Threads::Threads ZLIB::ZLIB libelas ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ftlnet)
+target_link_libraries(ftl-vision ftlcommon ftlrender Threads::Threads libelas ${OpenCV_LIBS} ${LIBSGM_LIBRARIES} ${CUDA_LIBRARIES} glog::glog ftlnet)
diff --git a/vision/src/streamer.cpp b/vision/src/streamer.cpp
index 7527735cb..d9bef41d4 100644
--- a/vision/src/streamer.cpp
+++ b/vision/src/streamer.cpp
@@ -1,7 +1,7 @@
#include <glog/logging.h>
#include <ftl/streamer.hpp>
#include <vector>
-#include <zlib.h>
+// #include <zlib.h>
// #include <lz4.h>
using ftl::Streamer;
--
GitLab