Skip to content
Commits on Source (3)
......@@ -8,7 +8,8 @@ Build-Depends: debhelper-compat (= 12),
libfontconfig1-dev,
libgstreamer-plugins-bad1.0-dev,
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev
libgstreamer1.0-dev,
zlib1g-dev
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/fast
Vcs-Git: https://salsa.debian.org/med-team/fast.git
......
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-07-26 00:33:52.970078802 +0100
+++ fast/CMakeLists.txt 2019-07-26 02:58:25.548595558 +0100
@@ -15,8 +15,8 @@
include(cmake/Macros.cmake)
#### Options
-option(FAST_BUILD_TESTS "Build FAST tests." ON)
-option(FAST_BUILD_EXAMPLES "Build examples." OFF)
+option(FAST_BUILD_TESTS "Build FAST tests." OFF)
+option(FAST_BUILD_EXAMPLES "Build examples." ON)
option(FAST_BUILD_TOOLS "Build tools." ON)
option(FAST_BUILD_DOCS "Build API documentation" OFF)
option(FAST_DOWNLOAD_TEST_DATA "Download test data automatically (> 1 GB)" OFF)
use_system_zlib.patch
disable_tests.patch
Index: fast/cmake/ExternalZlib.cmake
===================================================================
--- fast.orig/cmake/ExternalZlib.cmake 2019-07-26 09:34:34.497861993 +0100
+++ fast/cmake/ExternalZlib.cmake 2019-07-26 09:34:34.493861960 +0100
@@ -1,24 +1,24 @@
# Download and set up zlib
-include(cmake/Externals.cmake)
+#include(cmake/Externals.cmake)
-ExternalProject_Add(zlib
- PREFIX ${FAST_EXTERNAL_BUILD_DIR}/zlib
- BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/zlib
- GIT_REPOSITORY "https://github.com/madler/zlib.git"
- GIT_TAG "v1.2.9"
- CMAKE_ARGS
- -DCMAKE_MACOSX_RPATH=ON
- CMAKE_CACHE_ARGS
- -DCMAKE_BUILD_TYPE:STRING=Release
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
- -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
- -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
-)
-if(WIN32)
- set(ZLIB_LIBRARY debug zlibd.lib optimized zlib.lib)
-else(WIN32)
- set(ZLIB_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif(WIN32)
-list(APPEND LIBRARIES ${ZLIB_LIBRARY})
-list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
\ No newline at end of file
+#ExternalProject_Add(zlib
+# PREFIX ${FAST_EXTERNAL_BUILD_DIR}/zlib
+# BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/zlib
+# GIT_REPOSITORY "https://github.com/madler/zlib.git"
+# GIT_TAG "v1.2.9"
+# CMAKE_ARGS
+# -DCMAKE_MACOSX_RPATH=ON
+# CMAKE_CACHE_ARGS
+# -DCMAKE_BUILD_TYPE:STRING=Release
+# -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+# -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
+# -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
+#)
+#if(WIN32)
+# set(ZLIB_LIBRARY debug zlibd.lib optimized zlib.lib)
+#else(WIN32)
+#set(ZLIB_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
+ #endif(WIN32)
+list(APPEND LIBRARIES /usr/lib/x86_64-linux-gnu/libz.so)
+#list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-07-26 09:34:34.497861993 +0100
+++ fast/CMakeLists.txt 2019-07-26 09:34:59.850068126 +0100
@@ -166,6 +166,7 @@
## Link everything
message("-- LIBS: ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES}")
target_link_libraries(FAST PUBLIC ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES})
+target_link_libraries(FAST PUBLIC z)
if(FAST_MODULE_Visualization AND FAST_BUILD_QT5)
qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
endif()