From b942184881167f39ae7f11624bb8d179a929f310 Mon Sep 17 00:00:00 2001 From: Dimitri Vlachos Date: Wed, 29 Jan 2025 12:47:14 +0000 Subject: [PATCH] Update CMake to allow inclusion --- CMakeLists.txt | 76 +++++++++++++++++++++++----------------------- dx2/CMakeLists.txt | 3 +- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcf5570..dd87a15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" +# ) diff --git a/dx2/CMakeLists.txt b/dx2/CMakeLists.txt index b5c3d73..b2a8921 100644 --- a/dx2/CMakeLists.txt +++ b/dx2/CMakeLists.txt @@ -4,7 +4,7 @@ add_library( ) target_link_libraries( dx2 - PRIVATE + PUBLIC Eigen3::Eigen nlohmann_json::nlohmann_json hdf5::hdf5 @@ -16,4 +16,3 @@ target_include_directories( $ $ ) -target_link_libraries(dx2 PUBLIC $)