From ba75a6c6a0231f93fd40480992beec46b0f64885 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sun, 30 Jul 2017 15:47:29 +0200 Subject: Allow to build KConfig without Qt5Gui Summary: This is particularly useful for cross-compilation, where we only need the kconfig_compiler on the host system. Reviewers: #frameworks, apol, aacid Reviewed By: aacid Subscribers: aacid Tags: #frameworks Differential Revision: https://phabricator.kde.org/D6994 --- src/CMakeLists.txt | 4 +++- src/core/CMakeLists.txt | 3 --- src/gui/CMakeLists.txt | 4 ---- src/kconf_update/CMakeLists.txt | 2 -- src/kconfig_compiler/CMakeLists.txt | 2 -- 5 files changed, 3 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 998a1d52..d4ca8869 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(core) -add_subdirectory(gui) +if(TARGET Qt5::Gui) + add_subdirectory(gui) +endif() add_subdirectory(kconfig_compiler) add_subdirectory(kconf_update) add_subdirectory(kreadconfig) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9b7491c5..46fabd50 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,6 +1,3 @@ - -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - set(libkconfigcore_SRCS kconfig.cpp kconfigbase.cpp diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 9659326f..08786d31 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,7 +1,3 @@ - -find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - set(libkconfiggui_SRCS kconfiggui.cpp kconfiggroupgui.cpp diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt index b1342a8d..db115115 100644 --- a/src/kconf_update/CMakeLists.txt +++ b/src/kconf_update/CMakeLists.txt @@ -1,5 +1,3 @@ -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - remove_definitions(-DQT_NO_CAST_FROM_ASCII) ########### next target ############### diff --git a/src/kconfig_compiler/CMakeLists.txt b/src/kconfig_compiler/CMakeLists.txt index 004a6494..dc0a08db 100644 --- a/src/kconfig_compiler/CMakeLists.txt +++ b/src/kconfig_compiler/CMakeLists.txt @@ -16,8 +16,6 @@ else() add_executable(KF5::kconfig_compiler ALIAS kconfig_compiler) endif() -find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - target_link_libraries(kconfig_compiler Qt5::Xml) ecm_mark_nongui_executable(kconfig_compiler) -- cgit v1.2.1