Skip to content
Snippets Groups Projects
Commit 06054623 authored by Flavien BRIDAULT's avatar Flavien BRIDAULT
Browse files

fix(io): add some Dependencies.cmake

To build our current projects with sight 21.0, we needed to add missing `Dependencies.cmake` files, otherwise people would have to find the necessary `find_package`commands to run first.
Besides this, an unrelated change has been made to reenable the load of extra bundle paths. This is needed when you depend on more than two repositories.

Closes #693 
Merge branch '693-io-add-dependencies-cmake-in-io_vtk' into 'dev'
See merge request sight/sight!552
parents f9a207e5 4e8e9724
Branches 706-core-resources-from-activities-are-not-found
Tags
No related merge requests found
sight_add_target( geometry_data TYPE LIBRARY PCH pchData )
find_package(glm QUIET REQUIRED)
target_include_directories(geometry_data SYSTEM PUBLIC ${GLM_INCLUDE_DIRS})
target_link_libraries(geometry_data PUBLIC core data)
......
......
sight_add_target( geometry_vision TYPE LIBRARY PCH OFF )
find_package(OpenCV QUIET REQUIRED COMPONENTS opencv_calib3d opencv_aruco)
target_link_libraries(geometry_vision PUBLIC opencv_calib3d opencv_aruco)
target_link_libraries(geometry_vision PUBLIC core data geometry_eigen)
find_package(Qt5 QUIET COMPONENTS Test REQUIRED)
target_link_libraries(geometry_vision PRIVATE Qt5::Test)
target_link_libraries(geometry_vision PUBLIC opencv_calib3d opencv_aruco)
find_package(Ceres QUIET REQUIRED)
target_link_libraries(geometry_vision PUBLIC ${CERES_LIBRARIES})
target_include_directories(geometry_vision SYSTEM PRIVATE ${CERES_INCLUDE_DIRS})
target_link_libraries(geometry_vision PUBLIC core data geometry_eigen)
if(SIGHT_BUILD_TESTS)
add_subdirectory(test)
endif(SIGHT_BUILD_TESTS)
find_package(OpenCV QUIET REQUIRED COMPONENTS opencv_calib3d opencv_aruco)
find_package(Ceres QUIET REQUIRED)
sight_add_target( io_dimse TYPE LIBRARY PCH pchData )
find_package(DCMTK QUIET REQUIRED)
target_include_directories(io_dimse PRIVATE ${DCMTK_INCLUDE_DIRS})
target_link_libraries(io_dimse PUBLIC ${DCMTK_LIBRARIES})
......
......
find_package(DCMTK QUIET REQUIRED)
sight_add_target( io_opencv TYPE LIBRARY )
find_package(OpenCV QUIET REQUIRED COMPONENTS opencv_calib3d)
target_link_libraries(io_opencv PUBLIC opencv_calib3d)
target_link_libraries(io_opencv PUBLIC
core
data
)
target_link_libraries(io_opencv PUBLIC core data)
if(SIGHT_BUILD_TESTS)
add_subdirectory(test)
......
......
find_package(OpenCV QUIET REQUIRED COMPONENTS opencv_calib3d)
sight_add_target( io_vtk TYPE LIBRARY PCH pchData WARNINGS_AS_ERRORS ON )
find_package(VTK QUIET REQUIRED COMPONENTS
vtkFiltersGeometry
vtkFiltersModeling
vtkIOExport
vtkIOGeometry
vtkIOImage
vtkIOLegacy
vtkIOPLY
vtkIOXML
vtkRenderingFreeType
vtkRenderingOpenGL2 # Needed notably for the VtkObjExporter
)
if(VCPKG_TARGET_TRIPLET)
# VTK9
target_link_libraries(io_vtk PUBLIC
......
......
find_package(VTK QUIET REQUIRED COMPONENTS
vtkFiltersGeometry
vtkFiltersModeling
vtkIOExport
vtkIOGeometry
vtkIOImage
vtkIOLegacy
vtkIOPLY
vtkIOXML
vtkRenderingFreeType
vtkRenderingOpenGL2 # Needed notably for the VtkObjExporter
)
......@@ -5,7 +5,7 @@ target_include_directories(ui_dicom SYSTEM PRIVATE ${DCMTK_INCLUDE_DIRS})
target_link_libraries(ui_dicom PRIVATE ${DCMTK_LIBRARIES})
find_package(Qt5 QUIET COMPONENTS Core Gui Widgets Concurrent REQUIRED)
target_link_libraries(ui_dicom PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent)
target_link_libraries(ui_dicom PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent)
set_target_properties(ui_dicom PROPERTIES AUTOMOC TRUE)
target_link_libraries(ui_dicom PUBLIC
......
......
......@@ -137,7 +137,7 @@ int main(int argc, char* argv[])
po::options_description options("Sight application launcher options");
options.add_options()
("help,h", "Show help message")
("module-path,B", "Adds a module path")
("module-path,B", po::value(&modulePaths), "Adds a module path")
;
// Log options
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment