Changeset View
Changeset View
Standalone View
Standalone View
CMakeLists.txt
Show All 16 Lines | |||||
17 | include(CheckIncludeFiles) | 17 | include(CheckIncludeFiles) | ||
18 | include(ECMMarkNonGuiExecutable) | 18 | include(ECMMarkNonGuiExecutable) | ||
19 | include(ECMPackageConfigHelpers) | 19 | include(ECMPackageConfigHelpers) | ||
20 | include(FeatureSummary) | 20 | include(FeatureSummary) | ||
21 | include(GenerateExportHeader) | 21 | include(GenerateExportHeader) | ||
22 | 22 | | |||
23 | include(CheckIncludeFile) | 23 | include(CheckIncludeFile) | ||
24 | include(CheckSymbolExists) | 24 | include(CheckSymbolExists) | ||
25 | check_include_file("sys/prctl.h" HAVE_SYS_PRCTL_H) | 25 | check_include_file("sys/prctl.h" HAVE_SYS_PRCTL_H) | ||
26 | check_symbol_exists(PR_SET_DUMPABLE "sys/prctl.h" HAVE_PR_SET_DUMPABLE) | 26 | check_symbol_exists(PR_SET_DUMPABLE "sys/prctl.h" HAVE_PR_SET_DUMPABLE) | ||
27 | add_feature_info("prctl-dumpable" HAVE_PR_SET_DUMPABLE "Required for disallow ptrace on greeter and kcheckpass process") | 27 | check_include_file("sys/procctl.h" HAVE_SYS_PROCCTL_H) | ||
28 | check_symbol_exists(PROC_TRACE_CTL "sys/procctl.h" HAVE_PROC_TRACE_CTL) | ||||
29 | if (HAVE_PR_SET_DUMPABLE OR HAVE_PROC_TRACE_CTL) | ||||
30 | set(CAN_DISABLE_PTRACE TRUE) | ||||
rakuco: I think you need to merge these two `add_feature_info()` calls: as-is, either one or the other… | |||||
31 | endif () | ||||
32 | add_feature_info("prctl/procctl tracing control" | ||||
33 | CAN_DISABLE_PTRACE | ||||
34 | "Required for disallow ptrace on greeter and kcheckpass process") | ||||
While here, you could adjust the wording a little, like I suggested in my comment ("disallow" -> "disallowing", "the greeter and kcheckpass processes"). rakuco: While here, you could adjust the wording a little, like I suggested in my comment ("disallow"… | |||||
28 | 35 | | |||
29 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS | 36 | find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS | ||
30 | Crash | 37 | Crash | ||
31 | Declarative | 38 | Declarative | ||
32 | GlobalAccel | 39 | GlobalAccel | ||
33 | I18n | 40 | I18n | ||
34 | IdleTime | 41 | IdleTime | ||
35 | KCMUtils | 42 | KCMUtils | ||
▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines |
I think you need to merge these two add_feature_info() calls: as-is, either one or the other will always be shown in the "disabled features" list, and I guess you only want this to happen if neither call/header is found. Perhaps something like this: