Skip to content

cmake: Add KDDockWidgets_ENABLE_HARDENED option #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamsergio merged 1 commit into from
Nov 6, 2025
Merged

cmake: Add KDDockWidgets_ENABLE_HARDENED option #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-qt6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
preset:
- name: ci-dev-qt6
qt_version: "6.10.0"
- name: ci-hardened
qt_version: "6.10.0"
- name: ci-release-qt6
qt_version: "6.3.*"
- name: ci-qtwidgets-qt6
Expand Down
17 changes: 12 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ option(KDDockWidgets_NO_SPDLOG "Don't use spdlog, even if it is found." OFF)
option(KDDockWidgets_USE_LLD "Use lld for linking" OFF)
option(KDDockWidgets_USE_VALGRIND "Runs the tests under valgrind" OFF)
option(KDDockWidgets_QML_MODULE "The QtQuick support will be built as a QML module" OFF)
option(KDDockWidgets_ENABLE_HARDENED "Enable -fhardened equivalent for GCC" OFF)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/ECM/modules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/KDAB/modules")
Expand Down Expand Up @@ -163,11 +164,17 @@ else()
set(QT_MIN_VERSION "5.15")
endif()

if(KDDockWidgets_DEVELOPER_MODE
AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "14.1"
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fhardened -O1")
if(KDDockWidgets_ENABLE_HARDENED)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fPIE -pie -Wl,-z,now -Wl,-z,relro -fstack-protector-strong -fstack-clash-protection -fcf-protection=full"
)
if(KDDockWidgets_DEVELOPER_MODE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrivial-auto-var-init=pattern")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftrivial-auto-var-init=zero")
endif()
endif()
endif()

# BEGIN frontend enabling
Expand Down
12 changes: 12 additions & 0 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,18 @@
"KDDockWidgets_QT6": "ON"
}
},
{
"name": "ci-hardened",
"inherits": [
"ci-release-qt6"
],
"description": "gcc fhardened build",
"binaryDir": "${sourceDir}/build-ci-hardened",
"cacheVariables": {
"KDDockWidgets_ENABLE_HARDENED": "ON",
"KDDockWidgets_DEVELOPER_MODE": "ON"
}
},
{
"name": "ci-release-qt6",
"description": "Qt6 non dev-mode",
Expand Down
1 change: 1 addition & 0 deletions Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- qtquick: Expose 'DockWidget::lastCloseReason' to QML
- qtquick: Add DockWidgetInstantiator::deleteDockWidgetLater
- qtwidgets: Support tabs in south location
- cmake: Add -DKDDockWidgets_ENABLE_HARDENED (default OFF). Follows Qt and adds -fhardened on supported compilers.

* v2.3.0
- For packagers:
Expand Down
Loading