Port to KF5, step 1: CMakeLists

src/CMakeLists.txt

@@ -1,5 +1,7 @@
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-set(danbooru_client_SRCS danbooruconnectwidget.cpp
+set(danbooru_client_SRCS
+    danbooruconnectwidget.cpp
     model/danboorupostdelegate.cpp
     model/danboorupostmodel.cpp
     danbooruclientview.cpp
@@ -8,29 +10,34 @@ set(danbooru_client_SRCS danbooruconnectwidget.cpp
     testpostdata.cpp
  )
 
-#kde4_add_ui_files(danbooru_client_SRCS danbooru_clientview_base.ui prefs_base.ui)
-#kde4_add_kcfg_files(danbooru_client_SRCS settings.kcfgc )
+#ki18n_wrap_ui(danbooru_client_SRCS danbooru_clientview_base.ui prefs_base.ui)
+#kconfig_add_kcfg_files(danbooru_client_SRCS settings.kcfgc )
 
 add_subdirectory(libdanbooru)
 
-include_directories(
-    ${QT_INCLUDES}
-    ${KDE_INCLUDES}
-    ${CMAKE_CURRENT_BINARY_DIR}/libdanbooru
-    ${CMAKE_CURRENT_SOURCE_DIR}/model
-)
-
-kde4_add_ui_files(danbooru_client_SRCS
-                  testwidget.ui
-                  ui/danbooruclientview.ui
-                  ui/danbooruconnectwidget.ui)
-
-kde4_add_executable(danbooru_client
-                    ${danbooru_client_SRCS}
+target_link_libraries(danbooru_client PUBLIC
+                      Qt5::Widgets
+                      Qt5::Core
+                      Qt5::Quick
+                      KF5::CoreAddons
+                      KF5::IconThemes
+                      KF5::I18n
+                      KF5::TextWidgets
+                      KF5::XmlGui
+                      KF5::ConfigWidgets
+                      KF5::KIOCore
+                      danbooru
                     )
 
-target_link_libraries(danbooru_client ${KDE4_KDEUI_LIBS} ${QJSON_LIBRARIES} danbooru)
 
+ki18n_wrap_ui(danbooru_client_SRCS
+              testwidget.ui
+              ui/danbooruclientview.ui
+              ui/danbooruconnectwidget.ui)
+
+add_executable(danbooru_client
+                    ${danbooru_client_SRCS}
+                    )
 
 install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} )
 

src/libdanbooru/CMakeLists.txt

@@ -1,5 +1,6 @@
 project(libdanbooru)
-include (KDE4Defaults)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set (libdanbooru_VERSION_MAJOR 0)
 set (libdanbooru_VERSION_MINOR 0)
@@ -14,12 +15,10 @@ set (libdanbooru_SRCS
      utils.cpp)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/
-                     ${CMAKE_CURRENT_SOURCE_DIR}/ )
+add_library(danbooru STATIC ${libdanbooru_SRCS})
 
-kde4_add_library(danbooru STATIC ${libdanbooru_SRCS})
-
-target_link_libraries(danbooru ${KDE4_KIO_LIBS})
+target_link_libraries(danbooru PUBLIC
+                      KF5::KIOCore)
 
 install(TARGETS danbooru ${INSTALL_TARGETS_DEFAULT_ARGS})