Fixed linker problems and added version specific qt packages
This commit is contained in:
Submodule cmake-library updated: bb48fc24f4...6f6d014958
@@ -48,6 +48,9 @@ if ( BUILD_APPS )
|
|||||||
OpenGL
|
OpenGL
|
||||||
Gui
|
Gui
|
||||||
)
|
)
|
||||||
|
set(QT6_REQUIRED_PACKAGES
|
||||||
|
OpenGLWidgets
|
||||||
|
)
|
||||||
vci_qt ()
|
vci_qt ()
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ target_link_libraries (DecimaterGui
|
|||||||
OpenMeshCore
|
OpenMeshCore
|
||||||
OpenMeshTools
|
OpenMeshTools
|
||||||
${QT_TARGET}::OpenGL
|
${QT_TARGET}::OpenGL
|
||||||
|
${QT_TARGET}::Widgets
|
||||||
|
${QT_TARGET}::Gui
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (QT_VERSION_MAJOR GREATER 5)
|
||||||
|
target_link_libraries (DecimaterGui ${QT_TARGET}::OpenGLWidgets)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,12 @@ target_link_libraries ( ProgViewer
|
|||||||
OpenMeshCore
|
OpenMeshCore
|
||||||
OpenMeshTools
|
OpenMeshTools
|
||||||
${QT_TARGET}::OpenGL
|
${QT_TARGET}::OpenGL
|
||||||
|
${QT_TARGET}::Widgets
|
||||||
|
${QT_TARGET}::Gui
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (QT_VERSION_MAJOR GREATER 5)
|
||||||
|
target_link_libraries (ProgViewer ${QT_TARGET}::OpenGLWidgets)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,12 @@ target_link_libraries (QtViewer
|
|||||||
OpenMeshCore
|
OpenMeshCore
|
||||||
OpenMeshTools
|
OpenMeshTools
|
||||||
${QT_TARGET}::OpenGL
|
${QT_TARGET}::OpenGL
|
||||||
|
${QT_TARGET}::Widgets
|
||||||
|
${QT_TARGET}::Gui
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (QT_VERSION_MAJOR GREATER 5)
|
||||||
|
target_link_libraries (QtViewer ${QT_TARGET}::OpenGLWidgets)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ target_link_libraries (SubdividerGui
|
|||||||
OpenMeshCore
|
OpenMeshCore
|
||||||
OpenMeshTools
|
OpenMeshTools
|
||||||
${QT_TARGET}::OpenGL
|
${QT_TARGET}::OpenGL
|
||||||
|
${QT_TARGET}::Widgets
|
||||||
|
${QT_TARGET}::Gui
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (QT_VERSION_MAJOR GREATER 5)
|
||||||
|
target_link_libraries (SubdividerGui ${QT_TARGET}::OpenGLWidgets)
|
||||||
|
endif()
|
||||||
|
|||||||
@@ -26,5 +26,11 @@ target_link_libraries (Synthesizer
|
|||||||
OpenMeshCore
|
OpenMeshCore
|
||||||
OpenMeshTools
|
OpenMeshTools
|
||||||
${QT_TARGET}::OpenGL
|
${QT_TARGET}::OpenGL
|
||||||
|
${QT_TARGET}::Widgets
|
||||||
|
${QT_TARGET}::Gui
|
||||||
${OPENGL_LIBRARIES}
|
${OPENGL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (QT_VERSION_MAJOR GREATER 5)
|
||||||
|
target_link_libraries (Synthesizer ${QT_TARGET}::OpenGLWidgets)
|
||||||
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user