From 215cb8e8277a8dcedf851d4a3dfbd3dc1a9c3245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 19 Oct 2018 01:28:30 +0200 Subject: [PATCH] fixup! Add a BUILD_GUI define (for now only defined on BUILD_X11) --- cmake/ConkyBuildOptions.cmake | 5 +++++ cmake/config.h.in | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index 7af2774d06..a3ee54ab73 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -144,6 +144,11 @@ else(BUILD_X11) set(BUILD_XSHAPE false CACHE BOOL "Enable Xshape support" FORCE) endif(BUILD_X11) +# if we build with any GUI support +if(BUILD_X11) + set(BUILD_GUI true) +endif(BUILD_X11) + if(OWN_WINDOW) option(BUILD_ARGB "Build ARGB (real transparency) support" true) else(OWN_WINDOW) diff --git a/cmake/config.h.in b/cmake/config.h.in index 7938aedca1..fb91160ee4 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -113,9 +113,7 @@ #cmakedefine BUILD_HTTP 1 -#if defined(BUILD_X11) -#define BUILD_GUI -#endif +#cmakedefine BUILD_GUI 1 #cmakedefine BUILD_ICONV 1