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

Update docking framework to latest version and add fix to make redocking of floating windows work on WSL/wayland

Browse Source
This commit is contained in:
jonjenssen
2023-05-19 15:29:02 +02:00
committed by jonjenssen
parent bce8177033
commit 9a219ddcb2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -533,19 +533,19 @@ list(APPEND THIRD_PARTY_LIBRARIES qwt)
# ############################################################################## # ##############################################################################
# Qt Advanced Docking System # Qt Advanced Docking System
# ############################################################################## # ##############################################################################
set(ADS_VERSION "3.8.2") set(ADS_VERSION "4.0.3")
add_subdirectory(ThirdParty/qtadvanceddocking EXCLUDE_FROM_ALL) add_subdirectory(ThirdParty/qtadvanceddocking EXCLUDE_FROM_ALL)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated-copy) target_compile_options(qt5advanceddocking PRIVATE -Wno-deprecated-copy)
elseif(MSVC) elseif(MSVC)
target_compile_options(qtadvanceddocking PRIVATE /wd4996 /wd4005) target_compile_options(qt5advanceddocking PRIVATE /wd4996 /wd4005)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated) target_compile_options(qt5advanceddocking PRIVATE -Wno-deprecated)
endif() endif()
list(APPEND THIRD_PARTY_LIBRARIES qtadvanceddocking) list(APPEND THIRD_PARTY_LIBRARIES qt5advanceddocking)
# ############################################################################## # ##############################################################################
# Nightcharts # Nightcharts
@@ -620,7 +620,7 @@ if(RESINSIGHT_ENABLE_UNITY_BUILD)
# message("Cmake Unity build is enabled on : custom-opm-common") # message("Cmake Unity build is enabled on : custom-opm-common")
# set_property(TARGET custom-opm-common PROPERTY UNITY_BUILD true) # set_property(TARGET custom-opm-common PROPERTY UNITY_BUILD true)
message("Cmake Unity build is enabled on : qtadvanceddocking") message("Cmake Unity build is enabled on : qtadvanceddocking")
set_property(TARGET qtadvanceddocking PROPERTY UNITY_BUILD true) set_property(TARGET qt5advanceddocking PROPERTY UNITY_BUILD true)
endif() endif()
# ############################################################################## # ##############################################################################

2
ThirdParty/qtadvanceddocking vendored

Submodule ThirdParty/qtadvanceddocking updated: 78d5284d22...114f2701c6