OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Initial support for compilation on Qt6

Browse Source
This commit is contained in:
Sigurd Pettersen 2024-01-12 10:52:34 +01:00
parent 5993914276
commit 0dccff3867
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Fwk/VizFwk/CMakeLists.txt
View File

@ -53,7 +53,8 @@ add_subdirectory(LibUtilities)
option(CEE_BUILD_GUI_QT "Build GUI library for Qt" ON) option(CEE_BUILD_GUI_QT "Build GUI library for Qt" ON)
if (CEE_BUILD_GUI_QT) if (CEE_BUILD_GUI_QT)
option(CEE_USE_QT5 "Use Qt5" ON) option(CEE_USE_QT6 "Use Qt6" OFF)
option(CEE_USE_QT5 "Use Qt5" OFF)
add_subdirectory(LibGuiQt) add_subdirectory(LibGuiQt)
endif() endif()
@ -77,9 +78,11 @@ if (CEE_BUILD_TEST_APPS)
add_subdirectory(Tests/SnippetsBasis) add_subdirectory(Tests/SnippetsBasis)
if (CEE_BUILD_GUI_QT) if (CEE_BUILD_GUI_QT)
add_subdirectory(TestApps/Qt/QtMinimal_deprecated) if (CEE_USE_QT5)
add_subdirectory(TestApps/Qt/QtMultiView_deprecated) add_subdirectory(TestApps/Qt/QtMinimal_deprecated)
add_subdirectory(TestApps/Qt/QtSnippetRunner) add_subdirectory(TestApps/Qt/QtMultiView_deprecated)
add_subdirectory(TestApps/Qt/QtSnippetRunner)
endif()
endif() endif()
if (WIN32) if (WIN32)

28
Fwk/VizFwk/LibGuiQt/CMakeLists.txt
View File

@ -15,31 +15,43 @@ endif()
find_package(OpenGL) find_package(OpenGL)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) if (CEE_USE_QT6)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) find_package(Qt6 COMPONENTS REQUIRED Core Gui Widgets OpenGLWidgets)
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets )
elseif (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else()
message(FATAL_ERROR "No supported Qt version selected for build")
endif()
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfqtBasicAboutDialog.h cvfqtBasicAboutDialog.h
cvfqtGLWidget.h
cvfqtMouseState.h cvfqtMouseState.h
cvfqtOpenGLWidget.h cvfqtOpenGLWidget.h
cvfqtPerformanceInfoHud.h cvfqtPerformanceInfoHud.h
cvfqtUtils.h cvfqtUtils.h
cvfqtCvfBoundQGLContext_deprecated.h
cvfqtGLWidget_deprecated.h
) )
set(CEE_SOURCE_FILES set(CEE_SOURCE_FILES
cvfqtBasicAboutDialog.cpp cvfqtBasicAboutDialog.cpp
cvfqtGLWidget.cpp
cvfqtMouseState.cpp cvfqtMouseState.cpp
cvfqtOpenGLWidget.cpp cvfqtOpenGLWidget.cpp
cvfqtPerformanceInfoHud.cpp cvfqtPerformanceInfoHud.cpp
cvfqtUtils.cpp cvfqtUtils.cpp
cvfqtCvfBoundQGLContext_deprecated.cpp
cvfqtGLWidget_deprecated.cpp
) )
if (CEE_USE_QT5)
set(CEE_HEADER_FILES ${CEE_HEADER_FILES} cvfqtGLWidget.h)
set(CEE_SOURCE_FILES ${CEE_SOURCE_FILES} cvfqtGLWidget.cpp)
set(CEE_HEADER_FILES ${CEE_HEADER_FILES} cvfqtCvfBoundQGLContext_deprecated.h)
set(CEE_SOURCE_FILES ${CEE_SOURCE_FILES} cvfqtCvfBoundQGLContext_deprecated.cpp)
set(CEE_HEADER_FILES ${CEE_HEADER_FILES} cvfqtGLWidget_deprecated.h)
set(CEE_SOURCE_FILES ${CEE_SOURCE_FILES} cvfqtGLWidget_deprecated.cpp)
endif()
add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES})

3
Fwk/VizFwk/LibGuiQt/cvfqtBasicAboutDialog.cpp
View File

@ -255,8 +255,7 @@ void BasicAboutDialog::create()
// Library version // Library version
if (m_showLibraryVersion) if (m_showLibraryVersion)
{ {
QString ver; QString ver = QString("%1.%2%3-%4").arg(CVF_MAJOR_VERSION).arg(CVF_MINOR_VERSION).arg(CVF_SPECIAL_BUILD).arg(CVF_BUILD_NUMBER);
ver.sprintf("%s.%s%s-%s", CVF_MAJOR_VERSION, CVF_MINOR_VERSION, CVF_SPECIAL_BUILD, CVF_BUILD_NUMBER);
addStringPairToVerInfoLayout("Library ver.: ", ver, verInfoLayout, insertRow++); addStringPairToVerInfoLayout("Library ver.: ", ver, verInfoLayout, insertRow++);
} }

6
Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
View File

@ -4,8 +4,10 @@ project(LibGuiQt_UnitTests)
find_package(OpenGL) find_package(OpenGL)
# Qt if (CEE_USE_QT6)
if (CEE_USE_QT5) find_package(Qt6 COMPONENTS REQUIRED Core Gui Widgets OpenGLWidgets)
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets )
elseif (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
else() else()