OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-28 18:01:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add qt advanced docking to third party folder and build environment (#9109)

Browse Source 
* Add qt advanced docking as submodule
This commit is contained in:
jonjenssen 2022-07-05 11:06:10 +02:00 committed by GitHub
parent 6105813d28
commit fa2cf302bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "ThirdParty/fast_float"]
path = ThirdParty/fast_float
url = https://github.com/fastfloat/fast_float
[submodule "ThirdParty/qtadvanceddocking"]
path = ThirdParty/qtadvanceddocking
url = https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git

24
CMakeLists.txt
View File

@ -264,7 +264,7 @@ set(CMAKE_CXX_COMPILER_LAUNCHER ${TEMP_CMAKE_CXX_COMPILER_LAUNCHER})
# ##############################################################################
# Go through required git submodules #
# ##############################################################################
list(APPEND THIRD_PARTY_SUBMODULES fast_float qwt)
list(APPEND THIRD_PARTY_SUBMODULES fast_float qwt qtadvanceddocking)
# ##############################################################################
# Init GIT submodules if they haven't already #
@ -455,6 +455,28 @@ endif()
list(APPEND THIRD_PARTY_LIBRARIES qwt)
# ##############################################################################
# Qt Advanced Docking System
# ##############################################################################
set(ADS_VERSION "3.8.2")
add_subdirectory(ThirdParty/qtadvanceddocking)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated-copy)
elseif(MSVC)
target_compile_options(qtadvanceddocking PRIVATE /wd4996 /wd4005)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(qtadvanceddocking PRIVATE -Wno-deprecated)
endif()
if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : QtADS")
set_property(TARGET qtadvanceddocking PROPERTY UNITY_BUILD true)
endif()
list(APPEND THIRD_PARTY_LIBRARIES qtadvanceddocking)
# ##############################################################################
# Nightcharts
# ##############################################################################

1
ThirdParty/qtadvanceddocking vendored Submodule

@ -0,0 +1 @@
Subproject commit 75d58b3ea310a609ecaee695ef8d0f065413bc86