mirror of
https://github.com/OPM/ResInsight.git
synced 2026-11-03 20:56:45 -06:00
Add qt advanced docking to third party folder and build environment (#9109)
* Add qt advanced docking as submodule
This commit is contained in:
1 parent
6105813d28
commit
fa2cf302bb
3 files changed
+27
-1
No files matched your search
@@ -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
|
||||
+23
-1
@@ -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
Submodule ThirdParty/qtadvanceddocking added at 75d58b3ea3.
Reference in new issue
Block a user