From b4ee07226fb8e1a9a45f20c1814170933785ef0c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 4 Jan 2017 21:48:42 +0100
Subject: [PATCH] [CMake] Workaround for conan tiff-package.
---
Applications/DataExplorer/DataExplorer.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 0fc092d5ac8..71b12b747c4 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -67,6 +67,12 @@ target_link_libraries(DataExplorer
logog
)
+# Workaround for Windows conan tiff-package
+if(USE_CONAN AND WIN32)
+ find_package(ZLIB REQUIRED)
+ target_link_libraries(DataExplorer ${ZLIB_LIBRARIES})
+endif()
+
if(CMAKE_CROSSCOMPILING)
target_link_libraries(DataExplorer
${QT_XML_DEPS_LIBRARIES}
--
GitLab