From 5ae2e106ab92eb84228697775e62913d3efa1742 Mon Sep 17 00:00:00 2001 From: AndreaRigoni Date: Fri, 20 Feb 2026 17:27:30 +0000 Subject: [PATCH] added conanfile --- CMake/{FindVTK.cmake => FindVTK.cmake.bak} | 0 CMakeLists.txt | 4 +++- CMakeUserPresets.json | 9 +++++++++ conanfile.txt | 7 +++++++ src/Math/CMakeLists.txt | 2 +- src/Vtk/CMakeLists.txt | 2 +- src/Vtk/uLibVtkInterface.cxx | 2 +- src/Vtk/vtkMuonScatter.h | 2 +- src/Vtk/vtkVoxImage.h | 10 +++++----- 9 files changed, 28 insertions(+), 10 deletions(-) rename CMake/{FindVTK.cmake => FindVTK.cmake.bak} (100%) create mode 100644 CMakeUserPresets.json create mode 100644 conanfile.txt diff --git a/CMake/FindVTK.cmake b/CMake/FindVTK.cmake.bak similarity index 100% rename from CMake/FindVTK.cmake rename to CMake/FindVTK.cmake.bak diff --git a/CMakeLists.txt b/CMakeLists.txt index 36e686c..cb64190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,11 +84,13 @@ enable_testing() set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_RUNTIME OFF) +message(STATUS "CMAKE_PREFIX_PATH is ${CMAKE_PREFIX_PATH}") find_package(Boost 1.45.0 COMPONENTS program_options REQUIRED) include_directories(${Boost_INCLUDE_DIRS}) find_package(Eigen3 CONFIG REQUIRED) -include(${EIGEN3_USE_FILE}) +get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) +include_directories(${EIGEN3_INCLUDE_DIRS}) find_package(ROOT CONFIG REQUIRED) include(${ROOT_USE_FILE}) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json new file mode 100644 index 0000000..945b382 --- /dev/null +++ b/CMakeUserPresets.json @@ -0,0 +1,9 @@ +{ + "version": 4, + "vendor": { + "conan": {} + }, + "include": [ + "build/CMakePresets.json" + ] +} \ No newline at end of file diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..f8fb77a --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,7 @@ +[requires] +eigen/3.4.0 +boost/1.83.0 + +[generators] +CMakeDeps +CMakeToolchain diff --git a/src/Math/CMakeLists.txt b/src/Math/CMakeLists.txt index 51e4492..9aec9ee 100644 --- a/src/Math/CMakeLists.txt +++ b/src/Math/CMakeLists.txt @@ -32,7 +32,7 @@ set(SOURCES VoxRaytracer.cpp Structured2DGrid.cpp Structured4DGrid.cpp) -set(LIBRARIES ${Eigen_LIBRARY} +set(LIBRARIES Eigen3::Eigen ${ROOT_LIBRARIES} ${VTK_LIBRARIES}) diff --git a/src/Vtk/CMakeLists.txt b/src/Vtk/CMakeLists.txt index 33b5585..9b8351b 100644 --- a/src/Vtk/CMakeLists.txt +++ b/src/Vtk/CMakeLists.txt @@ -14,7 +14,7 @@ set(SOURCES uLibVtkInterface.cxx vtkVoxRaytracerRepresentation.cpp vtkVoxImage.cpp) -set(LIBRARIES ${Eigen_LIBRARY} +set(LIBRARIES Eigen3::Eigen ${ROOT_LIBRARIES} ${VTK_LIBRARIES} ${PACKAGE_LIBPREFIX}Math) diff --git a/src/Vtk/uLibVtkInterface.cxx b/src/Vtk/uLibVtkInterface.cxx index 15a06a6..47ca752 100644 --- a/src/Vtk/uLibVtkInterface.cxx +++ b/src/Vtk/uLibVtkInterface.cxx @@ -37,7 +37,7 @@ #endif -#include +#include #include #include #include diff --git a/src/Vtk/vtkMuonScatter.h b/src/Vtk/vtkMuonScatter.h index 77a3a94..90b0c39 100644 --- a/src/Vtk/vtkMuonScatter.h +++ b/src/Vtk/vtkMuonScatter.h @@ -28,7 +28,7 @@ #ifndef VTKMUONSCATTER_H #define VTKMUONSCATTER_H -#include +#include #include #include #include diff --git a/src/Vtk/vtkVoxImage.h b/src/Vtk/vtkVoxImage.h index 442efe7..f94a334 100644 --- a/src/Vtk/vtkVoxImage.h +++ b/src/Vtk/vtkVoxImage.h @@ -28,11 +28,11 @@ #ifndef U_VTKVOXIMAGE_H #define U_VTKVOXIMAGE_H -#include "vtk/vtkVolume.h" -#include "vtk/vtkImageData.h" -#include "vtk/vtkXMLImageDataReader.h" -#include "vtk/vtkXMLImageDataWriter.h" -#include "vtk/vtkCubeSource.h" +#include +#include +#include +#include +#include #include