From 4a663815be0c110532d9be2ccdcaf0b389f9619e Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Wed, 6 Jan 2021 17:19:04 +0100 Subject: [PATCH] bzip2 from conan --- CMakeLists.txt | 4 +++- readLib/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09296e0..5b06500 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,9 @@ if (hasParent) set (CorsikaData_VERSION "1.1.0" PARENT_SCOPE) endif (hasParent) -find_package (BZip2 REQUIRED) +if (NOT TAGET CONAN_PKG::bzip2) + message (FATAL_ERROR "Please configure with conan bzip2 package") +endif (NOT TAGET CONAN_PKG::bzip2) enable_testing () if (${CMAKE_VERSION} VERSION_LESS "3.12.0") diff --git a/readLib/CMakeLists.txt b/readLib/CMakeLists.txt index 5b3e847..7fd299a 100644 --- a/readLib/CMakeLists.txt +++ b/readLib/CMakeLists.txt @@ -4,7 +4,7 @@ set ( ) add_library (CorsikaData STATIC ${files}) -target_link_libraries (CorsikaData PUBLIC BZip2::BZip2) +target_link_libraries (CorsikaData PUBLIC CONAN_PKG::bzip2) set_target_properties ( CorsikaData -- GitLab