diff --git a/.gitmodules b/.gitmodules --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "3rdparty/kirigami"] - path = 3rdparty/kirigami - url = git://anongit.kde.org/kirigami.git -[submodule "3rdparty/breeze-icons"] - path = 3rdparty/breeze-icons - url = git://anongit.kde.org/breeze-icons diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt deleted file mode 100644 --- a/3rdparty/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -option(STATIC_LIBRARY "" ON) - -add_subdirectory(kirigami) diff --git a/3rdparty/breeze-icons b/3rdparty/breeze-icons deleted file mode 160000 --- a/3rdparty/breeze-icons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3eeb52f15eaf5411dd783365f0d593cd1081672d diff --git a/3rdparty/kirigami b/3rdparty/kirigami deleted file mode 160000 --- a/3rdparty/kirigami +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 33e26b788cebe4961b02a931fb99dcde8f575c0c diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,13 +13,16 @@ include(KDEInstallDirs) include(KDECompilerSettings) include(KDECMakeSettings) +include(FeatureSummary) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) -add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC) +find_package(KF5Kirigami2 ${REQUIRED_KF5_VERSION} CONFIG QUIET) +set_package_properties(KF5Kirigami2 PROPERTIES + DESCRIPTION "KF5 Kirigami 2 is needed to provide the mobile UI components." + TYPE REQUIRED) -add_subdirectory(3rdparty) add_subdirectory(src) add_subdirectory(tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,6 +26,6 @@ include_directories(${CMAKE_SOURCE_DIR}/3rdparty/kirigami/src) add_executable(kairo ${exec_SRCS}) -target_link_libraries(kairo kairolib kirigamiplugin) +target_link_libraries(kairo kairolib) install(TARGETS kairo DESTINATION ${KDE_INSTALL_BINDIR}) diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -24,8 +24,6 @@ #include #include -#include "kirigamiplugin.h" - #include "circuitcontrol.h" #include "circuitlistmodel.h" #include "circuitmodel.h" @@ -39,9 +37,6 @@ QGuiApplication app(argc, argv); app.setApplicationName("Kairo"); - Q_INIT_RESOURCE(kirigami); - KirigamiPlugin::registerTypes(); - qmlRegisterType("Kairo", 1, 0, "CircuitListModel"); qmlRegisterUncreatableType("Kairo", 1, 0, "CircuitModel", "Loaded from C++"); qmlRegisterType("Kairo", 1, 0, "CircuitControl");