diff --git a/CHANGELOG b/CHANGELOG index a7c5d7472..ca2b53d25 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,10 @@ Ponca changelog -------------------------------------------------------------------------------- Current head (v.1.4 RC) +- Cmake + - [build] Enable exportation of projects linking to Ponca targets (#150) + - [install] Change output directory to `lib/cmake/Ponca` (#150) + -------------------------------------------------------------------------------- v.1.3 This release introduces several improvements around the KdTre API, as well as bug fixes, new features and doc diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c7c18bb..559dad7eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ endmacro() ################################################################################ set(Ponca_EXPORT_TARGET_DIR \${CMAKE_CURRENT_LIST_DIR}) -set(config_install_dir "${CMAKE_INSTALL_PREFIX}/lib/cmake/") +set(config_install_dir "${CMAKE_INSTALL_PREFIX}/lib/cmake/Ponca") set(include_install_dir "${CMAKE_INSTALL_PREFIX}/include") set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in index 8d4f7d2bf..aab020438 100644 --- a/cmake/Config.cmake.in +++ b/cmake/Config.cmake.in @@ -16,6 +16,7 @@ find_dependency(Eigen3 REQUIRED) include("@Ponca_EXPORT_TARGET_DIR@/PoncaTargets-Fitting.cmake") include("@Ponca_EXPORT_TARGET_DIR@/PoncaTargets-Common.cmake") +include("@Ponca_EXPORT_TARGET_DIR@/PoncaTargets-SpatialPartitioning.cmake") # Compute paths diff --git a/cmake/PoncaConfigureCommon.cmake b/cmake/PoncaConfigureCommon.cmake index d0cfae68b..062677059 100644 --- a/cmake/PoncaConfigureCommon.cmake +++ b/cmake/PoncaConfigureCommon.cmake @@ -31,10 +31,14 @@ install(TARGETS Common install(EXPORT CommonTargets FILE PoncaTargets-Common.cmake NAMESPACE Ponca:: - DESTINATION lib/cmake + DESTINATION lib/cmake/Ponca ) add_library(Ponca::Common ALIAS Common) +export(EXPORT CommonTargets + FILE ${CMAKE_CURRENT_BINARY_DIR}/PoncaTargets-Common.cmake + NAMESPACE Ponca:: +) ############################################# # HACK: have the files showing in the IDE, under the name 'ponca-src' diff --git a/cmake/PoncaConfigureFitting.cmake b/cmake/PoncaConfigureFitting.cmake index b947bbb78..643f43813 100644 --- a/cmake/PoncaConfigureFitting.cmake +++ b/cmake/PoncaConfigureFitting.cmake @@ -68,11 +68,15 @@ install(TARGETS Fitting install(EXPORT FittingTargets FILE PoncaTargets-Fitting.cmake NAMESPACE Ponca:: - DESTINATION lib/cmake + DESTINATION lib/cmake/Ponca COMPONENT Common ) add_library(Ponca::Fitting ALIAS Fitting) +export(EXPORT FittingTargets + FILE ${CMAKE_CURRENT_BINARY_DIR}/PoncaTargets-Fitting.cmake + NAMESPACE Ponca:: +) ############################################# # HACK: have the files showing in the IDE, under the name 'ponca-src' diff --git a/cmake/PoncaConfigureSpatialPartitioning.cmake b/cmake/PoncaConfigureSpatialPartitioning.cmake index 97a851c14..7cd35171e 100644 --- a/cmake/PoncaConfigureSpatialPartitioning.cmake +++ b/cmake/PoncaConfigureSpatialPartitioning.cmake @@ -46,11 +46,15 @@ install(TARGETS SpatialPartitioning install(EXPORT SpatialPartitioningTargets FILE PoncaTargets-SpatialPartitioning.cmake NAMESPACE Ponca:: - DESTINATION lib/cmake + DESTINATION lib/cmake/Ponca COMPONENT Common ) add_library(Ponca::SpatialPartitioning ALIAS SpatialPartitioning) +export(EXPORT SpatialPartitioningTargets + FILE ${CMAKE_CURRENT_BINARY_DIR}/PoncaTargets-SpatialPartitioning.cmake + NAMESPACE Ponca:: +) ############################################# # HACK: have the files showing in the IDE, under the name 'ponca-src'