OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-24 22:27:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Qt Advanced Docking (#13344)

Browse Source 
* Update to latest Qt Advanced Docking
This commit is contained in:
JJ authored and GitHub committed 2025-12-15 20:41:08 +01:00
1 parent 8f9b416563
commit 6eea1f023a
2 files changed
+12 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+11 -6
View File
@@ -617,20 +617,25 @@ list(APPEND THIRD_PARTY_LIBRARIES qwt)
# ##############################################################################
# Qt Advanced Docking System
# ##############################################################################
set(ADS_VERSION "4.2.1")
set(ADS_VERSION "4.4.1")
set(QT_VERSION_MAJOR 6)
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/qtadvanceddocking/cmake/modules
${CMAKE_MODULE_PATH}
)
add_subdirectory(ThirdParty/qtadvanceddocking EXCLUDE_FROM_ALL)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(qt6advanceddocking PRIVATE -Wno-deprecated-copy)
target_compile_options(qtadvanceddocking-qt6 PRIVATE -Wno-deprecated-copy)
elseif(MSVC)
target_compile_options(qt6advanceddocking PRIVATE /wd4996 /wd4005)
target_compile_options(qtadvanceddocking-qt6 PRIVATE /wd4996 /wd4005)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(qt6advanceddocking PRIVATE -Wno-deprecated)
target_compile_options(qtadvanceddocking-qt6 PRIVATE -Wno-deprecated)
endif()
list(APPEND THIRD_PARTY_LIBRARIES qt6advanceddocking)
list(APPEND THIRD_PARTY_LIBRARIES qtadvanceddocking-qt6)
# ##############################################################################
# Nightcharts
@@ -863,7 +868,7 @@ if(RESINSIGHT_ENABLE_UNITY_BUILD)
# message("Cmake Unity build is enabled on : custom-opm-common")
# set_property(TARGET custom-opm-common PROPERTY UNITY_BUILD true)
message("Cmake Unity build is enabled on : qtadvanceddocking")
set_property(TARGET qt6advanceddocking PROPERTY UNITY_BUILD true)
set_property(TARGET qtadvanceddocking-qt6 PROPERTY UNITY_BUILD true)
endif()
# ##############################################################################
ThirdParty/qtadvanceddocking
Vendored
+1 -1
Submodule ThirdParty/qtadvanceddocking updated: 234c591980...369bc1b539.