diff --git a/applications/plugins/image/imageConfig.cmake.in b/applications/plugins/image/imageConfig.cmake.in index f3a27c9ff55..c3de0b1abf6 100644 --- a/applications/plugins/image/imageConfig.cmake.in +++ b/applications/plugins/image/imageConfig.cmake.in @@ -1,13 +1,38 @@ -# CMake package configuration file for the plugin @PROJECT_NAME@ - @PACKAGE_GUARD@ @PACKAGE_INIT@ +set(IMAGE_HAVE_SOFA_GL @IMAGE_HAVE_SOFA_GL@) +set(IMAGE_HAVE_SOFA_GUI_QT @IMAGE_HAVE_SOFA_GUI_QT@) +set(IMAGE_HAVE_SOFAPYTHON @IMAGE_HAVE_SOFAPYTHON@) +set(IMAGE_HAVE_MULTITHREADING @IMAGE_HAVE_MULTITHREADING@) +set(IMAGE_HAVE_ZLIB @IMAGE_HAVE_ZLIB@) +set(IMAGE_HAVE_FREENECT @IMAGE_HAVE_FREENECT@) + find_package(Sofa.Core QUIET REQUIRED) -sofa_find_package(Sofa.Component.Visual QUIET REQUIRED) +find_package(Sofa.Component.Visual QUIET REQUIRED) + + +if(IMAGE_HAVE_SOFA_GL) + find_package(Sofa.GL QUIET REQUIRED) +endif() +if(IMAGE_HAVE_SOFAGUIQT) + find_package(Sofa.GUI.Qt QUIET REQUIRED) +endif() +if(IMAGE_HAVE_SOFAPYTHON) + find_package(SofaPython QUIET REQUIRED) +endif() +if(IMAGE_HAVE_MULTITHREADING) + find_package(MultiThreading QUIET REQUIRED) +endif() +if(IMAGE_HAVE_ZLIB) + find_package(ZLIB QUIET REQUIRED) +endif() +if(IMAGE_HAVE_FREENECT) + find_package(Freenect QUIET REQUIRED) +endif() -if(NOT TARGET @PROJECT_NAME@) - include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +if(NOT TARGET image) + include("${CMAKE_CURRENT_LIST_DIR}/imageTargets.cmake") endif() -check_required_components(@PROJECT_NAME@) +check_required_components(image) \ No newline at end of file diff --git a/applications/plugins/image/src/image/image_gui/CMakeLists.txt b/applications/plugins/image/src/image/image_gui/CMakeLists.txt index 5295ab5b16d..146d0e8f16b 100644 --- a/applications/plugins/image/src/image/image_gui/CMakeLists.txt +++ b/applications/plugins/image/src/image/image_gui/CMakeLists.txt @@ -29,7 +29,7 @@ if (NOT Qt5Core_FOUND) find_package(Qt6 COMPONENTS Core CoreTools REQUIRED QUIET) if (Qt6Core_FOUND) qt6_wrap_cpp(MOC_FILES ${MOC_HEADER_FILES}) - # message(FATAL_ERROR "Image_gui is not compatible with Qt6 yet.") # to remove once image_gui has been updated + message(FATAL_ERROR "Image_gui is not compatible with Qt6 yet.") # to remove once image_gui has been updated endif() # else() should never happened as it would already break in Sofa.GUI.Qt endif() diff --git a/applications/plugins/image/src/image/initImage.cpp b/applications/plugins/image/src/image/initImage.cpp index 33e2e24f003..2e1f18437bc 100644 --- a/applications/plugins/image/src/image/initImage.cpp +++ b/applications/plugins/image/src/image/initImage.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #if IMAGE_HAVE_SOFAPYTHON #include