From cdb71f43f359b6600644df0384307e4ad8acfe20 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 27 Sep 2022 16:47:13 +0300 Subject: [PATCH] generic: use the new kde4_bool_to_01() macro Signed-off-by: Ivailo Monev --- ConfigureChecks.cmake | 36 ++++++++++++++--------------- kcontrol/input/CMakeLists.txt | 2 +- ksysguard/ksysguardd/CMakeLists.txt | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 29c3ee9e..c63b37f6 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -16,28 +16,28 @@ set(XKBDIR "${xrootdir}/share/X11") check_function_exists(nice HAVE_NICE) check_include_files(malloc.h HAVE_MALLOC_H) -macro_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) # kcontrol/{fonts,kfontinst} -macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE) # kcontrol/fonts -macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # ksplash -macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb -macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # plasma, kwin -macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses -macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin -macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin -macro_bool_to_01(X11_Xkb_FOUND HAVE_XKB) # kglobalaccel, kcontrol/keyboard -macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin -macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker -macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kcontrol/keyboard -macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin -macro_bool_to_01(X11_XRes_FOUND HAVE_XRES) # ksysguard -macro_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kscreensaver +kde4_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) # kcontrol/{fonts,kfontinst} +kde4_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE) # kcontrol/fonts +kde4_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # ksplash +kde4_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb +kde4_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # plasma, kwin +kde4_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses +kde4_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin +kde4_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin +kde4_bool_to_01(X11_Xkb_FOUND HAVE_XKB) # kglobalaccel, kcontrol/keyboard +kde4_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) +kde4_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin +kde4_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker +kde4_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kcontrol/keyboard +kde4_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin +kde4_bool_to_01(X11_XRes_FOUND HAVE_XRES) # ksysguard +kde4_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kscreensaver cmake_reset_check_state() set(CMAKE_REQUIRED_INCLUDES ${X11_Xrandr_INCLUDE_PATH}) set(CMAKE_REQUIRED_LIBRARIES ${X11_Xrandr_LIB}) check_function_exists(XRRGetScreenSizeRange XRANDR_1_2_FOUND) -macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2) +kde4_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2) check_function_exists(XRRGetScreenResourcesCurrent XRANDR_1_3_FOUND) -macro_bool_to_01(XRANDR_1_3_FOUND HAS_RANDR_1_3) +kde4_bool_to_01(XRANDR_1_3_FOUND HAS_RANDR_1_3) cmake_reset_check_state() diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index c70c3d16..8ec0a671 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory( pics ) -macro_bool_to_01(LIBUSB_FOUND HAVE_LIBUSB) +kde4_bool_to_01(LIBUSB_FOUND HAVE_LIBUSB) configure_file ( config-kcontrol-input.h.cmake diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt index 3599ac65..43a2f03a 100644 --- a/ksysguard/ksysguardd/CMakeLists.txt +++ b/ksysguard/ksysguardd/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/CContLib/ ) # into kde 3.x it was installed into /etc/ add_definitions( -DKSYSGUARDDRCFILE="${KDE4_SYSCONF_INSTALL_DIR}/ksysguarddrc" ) -macro_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS) +kde4_bool_to_01(SENSORS_FOUND HAVE_LMSENSORS) configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)