Link to the hictk version provided by Conan

paulsengroup · May 21, 2024 · c6c3320 · c6c3320
1 parent d2f6e8c
commit c6c3320
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,6 +222,4 @@ endif()
 
 add_subdirectory(src)
 
-include(cmake/FetchExternalDeps.cmake)
-
 # include(cmake/Packaging.cmake)
diff --git a/cmake/FetchExternalDeps.cmake b/cmake/FetchExternalDeps.cmake
diff --git a/src/libmodle_io/CMakeLists.txt b/src/libmodle_io/CMakeLists.txt
@@ -5,6 +5,7 @@
 find_package(absl CONFIG REQUIRED)
 find_package(Boost CONFIG REQUIRED COMPONENTS iostreams)
 find_package(fmt CONFIG REQUIRED)
+find_package(hictk CONFIG REQUIRED)
 find_package(LibArchive CONFIG REQUIRED)
 find_package(BigWig CONFIG REQUIRED)
 find_package(readerwriterqueue CONFIG REQUIRED)
@@ -143,7 +144,7 @@ target_link_system_libraries(
   INTERFACE
   project_warnings
   project_options
-  hictk::cooler)
+  hictk::libhictk)
 
 set_target_properties(libmodle_io_contact_matrix PROPERTIES OUTPUT_NAME modle_io_contact_matrix)
 install(

diff --git a/src/modle/CMakeLists.txt b/src/modle/CMakeLists.txt
@@ -6,6 +6,7 @@ find_package(absl CONFIG REQUIRED)
 find_package(Boost CONFIG REQUIRED COMPONENTS headers)
 find_package(CLI11 CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
+find_package(hictk CONFIG REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(tomlplusplus CONFIG REQUIRED)
 
@@ -34,7 +35,7 @@ target_link_system_libraries(
   CLI11::CLI11
   spdlog::spdlog_header_only
   tomlplusplus::tomlplusplus
-  hictk)
+  hictk::libhictk)
 
 include(GNUInstallDirs)
 install(

diff --git a/src/modle_tools/CMakeLists.txt b/src/modle_tools/CMakeLists.txt
@@ -7,6 +7,7 @@ find_package(Boost CONFIG REQUIRED COMPONENTS headers)
 find_package(bshoshany-thread-pool CONFIG REQUIRED)
 find_package(CLI11 CONFIG REQUIRED)
 find_package(cpp-sort CONFIG REQUIRED)
+find_package(hictk CONFIG REQUIRED)
 find_package(readerwriterqueue CONFIG REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(tomlplusplus CONFIG REQUIRED)
@@ -55,7 +56,7 @@ target_link_system_libraries(
   Boost::headers
   bshoshany-thread-pool::bshoshany-thread-pool
   CLI11::CLI11
-  hictk
+  hictk::libhictk
   cpp-sort::cpp-sort
   readerwriterqueue::readerwriterqueue
   tomlplusplus::tomlplusplus