diff --git a/CMakeLists.txt b/CMakeLists.txt index ef3b984099eeedcc3ce0d98c94e5266bd3239099..5d5a06e1091b155dc1c393de696bbca07dd65453 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 78ce7d52c79333e4b237c1fe7aa9b1c0a764bcd6..3d851d469c66f19ce084a3bf0bbbf1f390adc636 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 02f915a938730181a6fe97e1097c5768c3169c82..51c346da25e0f367247cc33234a63bbac957e251 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 a0cc3f6b9f57fb1d43d5c56ed035c17b11b0da44..5320fd283d02d6468da3fb2d2192b9819b52a8e6 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 7527735cb6b6d207892b0bb2b8488ae3c12d16bf..d9bef41d43f1b9c9c273eb03a6c2e987ecb46432 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;