tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge two if(SAILFISHOS) calls

Browse source
This commit is contained in:
Nicolas Fella 2019-10-27 17:11:58 +01:00
parent ae7a3693d5
commit c568827735
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
CMakeLists.txt
View file

@ -85,17 +85,8 @@ option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF)
if(PRIVATE_DBUS_ENABLED OR APPLE) if(PRIVATE_DBUS_ENABLED OR APPLE)
add_compile_definitions(USE_PRIVATE_DBUS) add_compile_definitions(USE_PRIVATE_DBUS)
endif() 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(icon)
add_subdirectory(interfaces) add_subdirectory(interfaces)
add_subdirectory(data) add_subdirectory(data)
@ -103,11 +94,10 @@ add_subdirectory(plugins)
add_subdirectory(cli) add_subdirectory(cli)
add_subdirectory(declarativeplugin) 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(app)
add_subdirectory(indicator) add_subdirectory(indicator)
add_subdirectory(urlhandler) add_subdirectory(urlhandler)
@ -118,12 +108,21 @@ if (NOT SAILFISHOS)
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
else()
add_subdirectory(sfos) if(NOT WIN32)
add_subdirectory(kio)
add_subdirectory(plasmoid)
endif()
if(KF5Runner_FOUND)
add_subdirectory(runners)
endif() endif()
if(KF5DocTools_FOUND) if(KF5DocTools_FOUND)
add_subdirectory(doc) add_subdirectory(doc)
endif() endif()
else()
add_subdirectory(sfos)
endif()
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)