diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,12 +106,12 @@ ) #use dbus on linux, bsd etc, but not andoid and apple stuff -if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) +if (UNIX AND NOT ANDROID AND NOT(APPLE) AND NOT(DISABLE_DBUS)) find_package(Qt5DBus) add_definitions(-DKIRIGAMI_ENABLE_DBUS) endif() -if(BUILD_EXAMPLES AND CMAKE_SYSTEM_NAME STREQUAL "Android") +if(BUILD_EXAMPLES AND ANDROID) find_package(Qt5AndroidExtras ${REQUIRED_QT_VERSION} REQUIRED) endif() diff --git a/examples/staticcmake/src/CMakeLists.txt b/examples/staticcmake/src/CMakeLists.txt --- a/examples/staticcmake/src/CMakeLists.txt +++ b/examples/staticcmake/src/CMakeLists.txt @@ -8,7 +8,7 @@ qt5_add_resources(RESOURCES kirigami-icons.qrc resources.qrc) -if (CMAKE_SYSTEM_NAME STREQUAL "Android") +if (ANDROID) set(minimal_EXTRA_LIBS Qt5::AndroidExtras #FIXME: we shouldn't have to link to it but otherwise the lib won't be packaged on Android Qt5::QuickControls2) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,7 +49,7 @@ RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/../kirigami.qrc ) - if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) + if (UNIX AND NOT ANDROID AND NOT(APPLE) AND NOT(DISABLE_DBUS)) qt5_add_dbus_interface(kirigami_SRCS libkirigami/org.kde.KWin.TabletModeManager.xml tabletmodemanager_interface) endif() endif(STATIC_LIBRARY) @@ -60,7 +60,7 @@ if(STATIC_LIBRARY) SET_TARGET_PROPERTIES(kirigamiplugin PROPERTIES AUTOMOC_MOC_OPTIONS -Muri=org.kde.kirigami) - if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) + if (UNIX AND NOT ANDROID AND NOT(APPLE) AND NOT(DISABLE_DBUS)) set(Kirigami_EXTRA_LIBS Qt5::DBus) else() set(Kirigami_EXTRA_LIBS "") diff --git a/src/libkirigami/CMakeLists.txt b/src/libkirigami/CMakeLists.txt --- a/src/libkirigami/CMakeLists.txt +++ b/src/libkirigami/CMakeLists.txt @@ -8,7 +8,7 @@ ) #use dbus on linux, bsd etc, but not andoid and apple stuff -if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS)) +if (UNIX AND NOT ANDROID AND NOT(APPLE) AND NOT(DISABLE_DBUS)) qt5_add_dbus_interface(libkirigami_SRCS org.kde.KWin.TabletModeManager.xml tabletmodemanager_interface) set(LIBKIRIGAMKI_EXTRA_LIBS Qt5::DBus) endif()