Skip to content

Commit

Permalink
Update CMake to allow inclusion
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitrivlachos committed Jan 29, 2025
1 parent e6b14bc commit b942184
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 40 deletions.
76 changes: 38 additions & 38 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,44 +68,44 @@ add_subdirectory(tests)

# #######################################################################
# Installation
install(
TARGETS dx2
EXPORT DX2Targets
LIBRARY DESTINATION lib
# install(
# TARGETS dx2
# EXPORT DX2Targets
# LIBRARY DESTINATION lib

# FILE_SET HEADERS DESTINATION include/dx2
)
install(
FILES
include/dx2/dx2.h
DESTINATION include/dx2
)
# # FILE_SET HEADERS DESTINATION include/dx2
# )
# install(
# FILES
# include/dx2/dx2.h
# DESTINATION include/dx2
# )

install(
EXPORT DX2Targets
FILE DX2Targets.cmake
DESTINATION lib/cmake/DX2
)
# install(
# EXPORT DX2Targets
# FILE DX2Targets.cmake
# DESTINATION lib/cmake/DX2
# )

include(CMakePackageConfigHelpers)
configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/DX2Config.cmake"
INSTALL_DESTINATION "lib/cmake/DX2"
NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/DX2ConfigVersion.cmake"
VERSION "${DX2_VERSION_MAJOR}.${DX2_VERSION_MINOR}"
COMPATIBILITY AnyNewerVersion
)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/DX2Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/DX2ConfigVersion.cmake
DESTINATION lib/cmake/DX2
)
export(EXPORT DX2Targets
FILE "${CMAKE_CURRENT_BINARY_DIR}/DX2Targets.cmake"
)
# include(CMakePackageConfigHelpers)
# configure_package_config_file(
# ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
# "${CMAKE_CURRENT_BINARY_DIR}/DX2Config.cmake"
# INSTALL_DESTINATION "lib/cmake/DX2"
# NO_SET_AND_CHECK_MACRO
# NO_CHECK_REQUIRED_COMPONENTS_MACRO
# )
# write_basic_package_version_file(
# "${CMAKE_CURRENT_BINARY_DIR}/DX2ConfigVersion.cmake"
# VERSION "${DX2_VERSION_MAJOR}.${DX2_VERSION_MINOR}"
# COMPATIBILITY AnyNewerVersion
# )
# install(
# FILES
# ${CMAKE_CURRENT_BINARY_DIR}/DX2Config.cmake
# ${CMAKE_CURRENT_BINARY_DIR}/DX2ConfigVersion.cmake
# DESTINATION lib/cmake/DX2
# )
# export(EXPORT DX2Targets
# FILE "${CMAKE_CURRENT_BINARY_DIR}/DX2Targets.cmake"
# )
3 changes: 1 addition & 2 deletions dx2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ add_library(
)
target_link_libraries(
dx2
PRIVATE
PUBLIC
Eigen3::Eigen
nlohmann_json::nlohmann_json
hdf5::hdf5
Expand All @@ -16,4 +16,3 @@ target_include_directories(
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(dx2 PUBLIC $<TARGET_NAME_IF_EXISTS:hdf5::hdf5>)

0 comments on commit b942184

Please sign in to comment.