From c87fdb1a1a1b8f1cb68600014f493ccaa6c9593e Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sun, 5 Mar 2017 23:08:32 -0500 Subject: [PATCH] link zlib to samples and benchmarks as a temporary workaround --- benchmarks/CMakeLists.txt | 4 +++- samples/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index b361af9d..c723fd40 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -12,11 +12,13 @@ include_directories(${LIBRARY_INCLUDE_DIR}) file(GLOB SAMPLE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +find_package(ZLIB REQUIRED) + foreach(SAMPLE_SOURCE IN ITEMS ${SAMPLE_SOURCES}) get_filename_component(SAMPLE_NAME ${SAMPLE_SOURCE} NAME_WE) set(SAMPLE_EXECUTABLE benchmark-${SAMPLE_NAME}) add_executable(${SAMPLE_EXECUTABLE} ${SAMPLE_SOURCE}) - target_link_libraries(${SAMPLE_EXECUTABLE} xlnt) + target_link_libraries(${SAMPLE_EXECUTABLE} PRIVATE xlnt PRIVATE ${ZLIB_LIBRARIES}) endforeach() file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 1b5303b5..5bc7b462 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -10,11 +10,13 @@ endif() file(GLOB SAMPLE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) +find_package(ZLIB REQUIRED) + foreach(SAMPLE_SOURCE IN ITEMS ${SAMPLE_SOURCES}) get_filename_component(SAMPLE_NAME ${SAMPLE_SOURCE} NAME_WE) set(SAMPLE_EXECUTABLE sample-${SAMPLE_NAME}) add_executable(${SAMPLE_EXECUTABLE} ${SAMPLE_SOURCE}) - target_link_libraries(${SAMPLE_EXECUTABLE} xlnt) + target_link_libraries(${SAMPLE_EXECUTABLE} PRIVATE xlnt PRIVATE ${ZLIB_LIBRARIES}) endforeach() file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data