diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2025-08-22 21:37:54 +0300 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2025-08-23 15:33:42 +0300 |
| commit | 31bdb77a270848e2a3cfb2f71e41a0c5d8d44a37 (patch) | |
| tree | 1ea4b972b29f9c17d8dfade85f563b523d8534f5 /kdesktop/lock/main.cpp | |
| parent | 20a17f52d2cd9810ae6cc82337d0ecd05fc36d3b (diff) | |
| download | tdebase-feat/separate-tsak.tar.gz tdebase-feat/separate-tsak.zip | |
Separate WITH_TSAK and BUILD_TSAK flagsfeat/separate-tsak
As for now BUILD_TSAK was used as both: a flag for building the `tsak`
binary and to enable/disable tsak support in tdm/kdesktop. The problem
is it creates problem with split build (when each sub-package is built
independently): if `tsak` is built as a separate package there is no way
to enable/disable support for it when building `kdesktop`/`tdm` without
also triggerin the build of `tsak` itself.
Besides this issue it just violates convention that BUILD_* flags do not
conditionally enable functionality in other packages.
This commit separates this logic into two different flags: BUILD_TSAK
for building the tsak binary and WITH_TSAK for adding support for it to
kdesktop and/or tdm.
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
Diffstat (limited to 'kdesktop/lock/main.cpp')
| -rw-r--r-- | kdesktop/lock/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cpp b/kdesktop/lock/main.cpp index 41b918664..a937bfe03 100644 --- a/kdesktop/lock/main.cpp +++ b/kdesktop/lock/main.cpp @@ -479,7 +479,7 @@ int main( int argc, char **argv ) trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows(); trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart(); if (trinity_desktop_lock_use_system_modal_dialogs) { -#ifdef BUILD_TSAK +#ifdef WITH_TSAK trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", false) && KDesktopSettings::useTDESAK(); #else trinity_desktop_lock_use_sak = false; |