Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates to the build system #150

Merged
merged 2 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions cmake/Install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ set(targets

include(GNUInstallDirs)
foreach(tgt ${targets})
install(DIRECTORY "${PROJECT_SOURCE_DIR}/src/libhictk/${tgt}/include/hictk" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
DIRECTORY "${PROJECT_SOURCE_DIR}/src/libhictk/${tgt}/include/hictk"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT Libraries)
endforeach()

install(
Expand All @@ -31,6 +34,7 @@ install(
transformers
variant
EXPORT libhictk-targets
COMPONENT Libraries
FILE_SET HEADERS
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
Expand All @@ -43,6 +47,7 @@ install(

install(
EXPORT libhictk-targets
COMPONENT Libraries
FILE hictkTargets.cmake
NAMESPACE hictk::
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hictk/")
Expand All @@ -52,4 +57,12 @@ configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/hictkConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/hictkConfig.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hictk/")

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/hictkConfig.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hictk")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/hictkConfig.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/hictk"
COMPONENT Libraries)

install(
FILES "${PROJECT_SOURCE_DIR}/LICENSE"
DESTINATION "${CMAKE_INSTALL_DATADIR}/licenses/hictk/"
COMPONENT Libraries)
41 changes: 0 additions & 41 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# SPDX-License-Identifier: MIT

[requires]
boost/1.84.0#5cc9767cd47ba6b5e1b53ab4670f07fc
bshoshany-thread-pool/4.0.1#b7ce99198b3a54e403393961480085c7
catch2/3.5.3#2178a424c7c53da1e7df5fef1a051f1f
cli11/2.4.1#afacffd31f631bbb8b7c7d6425fe7a66
Expand All @@ -24,46 +23,6 @@ zstd/1.5.5#b87dc3b185caa4b122979ac4ae8ef7e8
CMakeDeps

[options]
boost*:system_no_deprecated=True
boost*:asio_no_deprecated=True
boost*:filesystem_no_deprecated=True
boost*:filesystem_version=4
boost*:zlib=False
boost*:bzip2=False
boost*:lzma=False
boost*:zstd=False
boost*:without_atomic=False
boost*:without_chrono=True
boost*:without_container=True
boost*:without_context=True
boost*:without_contract=True
boost*:without_coroutine=True
boost*:without_date_time=True
boost*:without_exception=False
boost*:without_fiber=True
boost*:without_filesystem=False
boost*:without_graph=True
boost*:without_graph_parallel=True
boost*:without_iostreams=True
boost*:without_json=True
boost*:without_locale=True
boost*:without_log=True
boost*:without_math=True
boost*:without_mpi=True
boost*:without_nowide=True
boost*:without_program_options=True
boost*:without_python=True
boost*:without_random=True
boost*:without_regex=True
boost*:without_serialization=True
boost*:without_stacktrace=True
boost*:without_system=False
boost*:without_test=True
boost*:without_thread=True
boost*:without_timer=True
boost*:without_type_erasure=True
boost*:without_url=True
boost*:without_wave=True
fmt*:header_only=True
hdf5*:enable_cxx=False
hdf5*:hl=False
Expand Down
9 changes: 5 additions & 4 deletions src/hictk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# SPDX-License-Identifier: MIT

find_package(Boost REQUIRED COMPONENTS headers filesystem)
find_package(CLI11 REQUIRED)
find_package(FMT REQUIRED)
find_package(readerwriterqueue REQUIRED)
Expand Down Expand Up @@ -44,23 +43,25 @@ target_link_libraries(hictk PRIVATE hictk_project_options hictk_project_warnings
target_link_system_libraries(
hictk
PRIVATE
Boost::headers
CLI11::CLI11
readerwriterqueue::readerwriterqueue
std::filesystem
PUBLIC
Boost::filesystem
fmt::fmt-header-only
spdlog::spdlog_header_only
Threads::Threads)

include(GNUInstallDirs)
install(
TARGETS hictk
COMPONENT Runtime
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/scratch/
PRIVATE_HEADER DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/scratch/)

install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/hictk/)
install(
FILES ${PROJECT_SOURCE_DIR}/LICENSE
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/hictk/
COMPONENT Runtime)
Loading