Properly link against zlib where required.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75521d1..6f41870 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options)
 find_package(Threads REQUIRED)
 find_package(Qt5 5.2.0 NO_MODULE OPTIONAL_COMPONENTS Widgets)
 find_package(ECM 1.0.0 NO_MODULE)
-
+find_package(ZLIB REQUIRED)
 include(FeatureSummary)
 
 if(Qt5_FOUND AND ECM_FOUND)
@@ -67,6 +67,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     3rdparty/
     ${LIBUNWIND_INCLUDE_DIR}
+    ${ZLIB_INCLUDE_DIRS}
 )
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -88,8 +89,9 @@ add_executable(heaptrack_interpret heaptrack_interpret.cpp)
 target_link_libraries(heaptrack_interpret backtrace)
 
 add_library(sharedprint STATIC accumulatedtracedata.cpp)
+target_link_libraries(sharedprint LINK_PUBLIC ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
 add_executable(heaptrack_print heaptrack_print.cpp)
-target_link_libraries(heaptrack_print ${Boost_LIBRARIES} sharedprint)
+target_link_libraries(heaptrack_print LINK_PRIVATE sharedprint)
 
 set(BIN_INSTALL_DIR "bin")
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 0365c03..4c3cb37 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -38,7 +38,6 @@ target_link_libraries(heaptrack_gui
     KF5::ConfigWidgets
     KF5::I18n
     KChart
-    ${Boost_LIBRARIES}
     sharedprint)
 
 install(TARGETS heaptrack_gui ${INSTALL_TARGETS_DEFAULT_ARGS})
\ No newline at end of file