philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source
This commit is contained in:
Sergio Martins
2021-01-04 00:20:56 +00:00
parent dd81e02d94 f4404dcbe0
commit 5b60a929ab
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -150,7 +150,7 @@ macro(set_compiler_flags targetName)
endif()
# Enable -Werror
if(NOT MSVC AND NOT ${PROJECT_NAME}_QT6 AND ${PROJECT_NAME}_WERROR)
if(NOT MSVC AND ${PROJECT_NAME}_WERROR)
target_compile_options(${targetName} PRIVATE -Werror -Wno-error=deprecated-declarations)
endif()

7
src/CMakeLists.txt
View File

@@ -233,7 +233,12 @@ else()
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR IS_CLANG_BUILD)
target_compile_options(kddockwidgets PRIVATE -Wshadow -Wconversion -fvisibility=hidden)
target_compile_options(kddockwidgets PRIVATE -Wshadow -fvisibility=hidden)
# Disable -Wconversion for Qt6. The qsizetype to int conversions are harmless
if (NOT ${PROJECT_NAME}_QT6)
target_compile_options(kddockwidgets PRIVATE -Wconversion)
endif()
if(IS_CLANG_BUILD)
target_compile_options(kddockwidgets PRIVATE -Wweak-vtables)