From 3a6bbb0115f0d3b2f176c914ed893c7d369738e2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 24 Jun 2018 20:47:19 +0200 Subject: [PATCH] Allow enabling GUI config even when no specific sources present Useful when GUI specific code is only wrapped using #ifdef so there are no extra files. --- cmake/modules/BasicConfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index 75a762a..8c248cf 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -182,7 +182,7 @@ endif() list(APPEND META_ADDITIONAL_STATIC_LINK_FLAGS -static-libstdc++ -static-libgcc) # options for enabling/disabling Qt GUI (if available) -if(WIDGETS_HEADER_FILES OR WIDGETS_SRC_FILES OR WIDGETS_UI_FILES) +if(WIDGETS_HEADER_FILES OR WIDGETS_SRC_FILES OR WIDGETS_UI_FILES OR META_HAS_WIDGETS_GUI) if(META_GUI_OPTIONAL) option(WIDGETS_GUI "enables/disables building the Qt Widgets GUI: yes (default) or no" ON) else() @@ -191,7 +191,7 @@ if(WIDGETS_HEADER_FILES OR WIDGETS_SRC_FILES OR WIDGETS_UI_FILES) else() set(WIDGETS_GUI OFF) endif() -if(QML_HEADER_FILES OR QML_SRC_FILES) +if(QML_HEADER_FILES OR QML_SRC_FILES OR META_HAS_QUICK_GUI) if(META_GUI_OPTIONAL) option(QUICK_GUI "enables/disables building the Qt Quick GUI: yes (default) or no" ON) else()