From c568827735433dfbe2958112f11825f22505a1ab Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sun, 27 Oct 2019 17:11:58 +0100 Subject: [PATCH] merge two if(SAILFISHOS) calls --- CMakeLists.txt | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e63deebb..ac0a919ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,17 +85,8 @@ option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF) if(PRIVATE_DBUS_ENABLED OR APPLE) add_compile_definitions(USE_PRIVATE_DBUS) endif() -add_subdirectory(core) -if(NOT SAILFISHOS) - add_subdirectory(kcm) - add_subdirectory(kcmplugin) - add_subdirectory(daemon) - if(NOT WIN32) - add_subdirectory(kio) - add_subdirectory(plasmoid) - endif() -endif() +add_subdirectory(core) add_subdirectory(icon) add_subdirectory(interfaces) add_subdirectory(data) @@ -103,11 +94,10 @@ add_subdirectory(plugins) add_subdirectory(cli) add_subdirectory(declarativeplugin) -if(KF5Runner_FOUND) - add_subdirectory(runners) -endif() - -if (NOT SAILFISHOS) +if(NOT SAILFISHOS) + add_subdirectory(kcm) + add_subdirectory(kcmplugin) + add_subdirectory(daemon) add_subdirectory(app) add_subdirectory(indicator) add_subdirectory(urlhandler) @@ -118,12 +108,21 @@ if (NOT SAILFISHOS) if(BUILD_TESTING) add_subdirectory(tests) endif() + + if(NOT WIN32) + add_subdirectory(kio) + add_subdirectory(plasmoid) + endif() + + if(KF5Runner_FOUND) + add_subdirectory(runners) + endif() + + if(KF5DocTools_FOUND) + add_subdirectory(doc) + endif() else() add_subdirectory(sfos) endif() -if(KF5DocTools_FOUND) - add_subdirectory(doc) -endif() - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)