diff --git a/cmake-library b/cmake-library index bb48fc24..6f6d0149 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit bb48fc24f4910a39dc2182fc250c998810ca041c +Subproject commit 6f6d014958f62516be5a3d18d114733d661f63f8 diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 47468239..ebf10ff9 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -48,6 +48,9 @@ if ( BUILD_APPS ) OpenGL Gui ) + set(QT6_REQUIRED_PACKAGES + OpenGLWidgets + ) vci_qt () set(CMAKE_AUTOMOC ON) endif() diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index 303a325a..d6230e7e 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -30,6 +30,12 @@ target_link_libraries (DecimaterGui OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (DecimaterGui ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index 95b69568..2a3e2daf 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -29,6 +29,12 @@ target_link_libraries ( ProgViewer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (ProgViewer ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index 4c14e5a5..38fb3e33 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -31,6 +31,12 @@ target_link_libraries (QtViewer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (QtViewer ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 57145ea5..b981841b 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -29,6 +29,11 @@ target_link_libraries (SubdividerGui OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (SubdividerGui ${QT_TARGET}::OpenGLWidgets) +endif() diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index 68f731e5..1cc83663 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -26,5 +26,11 @@ target_link_libraries (Synthesizer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) + +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (Synthesizer ${QT_TARGET}::OpenGLWidgets) +endif()