From 6bf00c781f7cf5984a45977891e827fbcb632596 Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@tu-dortmund.de>
Date: Tue, 29 Sep 2020 21:38:15 +0200
Subject: [PATCH] zlib dep. to cnpy, not C8 utilities
---
Framework/Utilities/CMakeLists.txt | 3 ---
ThirdParty/cnpy/CMakeLists.txt | 7 +++----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Framework/Utilities/CMakeLists.txt b/Framework/Utilities/CMakeLists.txt
index f0dbc8991..b1c8ebed0 100644
--- a/Framework/Utilities/CMakeLists.txt
+++ b/Framework/Utilities/CMakeLists.txt
@@ -13,8 +13,6 @@ else ()
endif()
endif ()
-find_package(ZLIB)
-
#
# library setup
#
@@ -60,7 +58,6 @@ target_link_libraries (
C8::ext::boost # so far only for MetaProgramming
C8::ext::eigen3 # for COMboost
cnpy # for SaveBoostHistogram
- ZLIB::ZLIB # for SaveBoostHistogram
)
target_include_directories (
diff --git a/ThirdParty/cnpy/CMakeLists.txt b/ThirdParty/cnpy/CMakeLists.txt
index ef3d2ea98..868aafd1d 100644
--- a/ThirdParty/cnpy/CMakeLists.txt
+++ b/ThirdParty/cnpy/CMakeLists.txt
@@ -24,13 +24,12 @@ set_target_properties (
# PUBLIC_HEADER "${MODEL_HEADERS}"
)
+find_package(ZLIB)
+
# target dependencies on other libraries (also the header onlys)
target_link_libraries (
cnpy
- CORSIKAunits
- CORSIKAparticles
- CORSIKAgeometry
- CORSIKAsetup
+ ${ZLIB_LIBRARIES}
)
target_include_directories (
--
GitLab