diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f004d3..94d5128 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,12 +39,16 @@ endif() target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Core) target_link_libraries(${PROJECT_NAME} PUBLIC CGAL::CGAL) +target_include_directories(${PROJECT_NAME} PUBLIC "$") +target_include_directories(${PROJECT_NAME} PUBLIC "$") +target_include_directories(${PROJECT_NAME} PUBLIC "$") + # Install rules for the library and the headers; CMake package configurations files sofa_create_package_with_targets( PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION ${PROJECT_VERSION} TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES INCLUDE_SOURCE_DIR "src" - INCLUDE_INSTALL_DIR "MeshSkeletonizationPlugin" + INCLUDE_INSTALL_DIR "${PROJECT_NAME}" RELOCATABLE "plugins" - ) \ No newline at end of file +) diff --git a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.cpp b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.cpp index f7e51be..63a5d8c 100644 --- a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.cpp +++ b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.cpp @@ -1,4 +1,5 @@ -#include "SkeletonGraph.h" +#include + #include #include diff --git a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.h b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.h index 200542f..a61aaf6 100644 --- a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.h +++ b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonGraph.h @@ -1,6 +1,7 @@ #pragma once -#include "SkeletonNode.h" +#include +#include #include #include @@ -15,7 +16,7 @@ namespace meshskeletonizationplugin /// MeshSkeletonization/SkeletonizationLoader's Export_polylines: blocks of /// "x y z" lines separated by a blank line) and stores it as a graph of /// SkeletonNode, then turns it into a rooted parent/children tree. -class SkeletonGraph +class SOFA_MESHSKELETONIZATIONPLUGIN_API SkeletonGraph { public: /// Parses the file, merging points that are within `mergeTolerance` of an diff --git a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonNode.h b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonNode.h index 514e199..97e495a 100644 --- a/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonNode.h +++ b/src/MeshSkeletonizationPlugin/SkeletonGraph/SkeletonNode.h @@ -9,7 +9,7 @@ namespace meshskeletonizationplugin /// A single node of a skeletonized structure (e.g. a vessel centerline point). /// Deliberately has no SOFA/CGAL dependency so it can be reused, tested, /// and serialized independently of the plugin's simulation types. -class SkeletonNode +class SOFA_MESHSKELETONIZATIONPLUGIN_API SkeletonNode { public: SkeletonNode() = default;