diff --git a/active/app/CMakeLists.txt b/active/app/CMakeLists.txt index dd0c75da0..8c27bb7e7 100644 --- a/active/app/CMakeLists.txt +++ b/active/app/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ) +include_directories( ${QT_INCLUDES} ) add_subdirectory(src) diff --git a/active/app/src/CMakeLists.txt b/active/app/src/CMakeLists.txt index 1004dbd38..23844604a 100644 --- a/active/app/src/CMakeLists.txt +++ b/active/app/src/CMakeLists.txt @@ -3,16 +3,16 @@ set(active-documentviewer_SRCS main.cpp ) -kde4_add_executable(active-documentviewer ${active-documentviewer_SRCS}) +add_executable(active-documentviewer ${active-documentviewer_SRCS}) find_package(ActiveApp REQUIRED) -include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ${ACTIVEAPP_INCLUDE_DIR}) +include_directories( ${QT_INCLUDES} ${ACTIVEAPP_INCLUDE_DIR}) target_link_libraries(active-documentviewer - ${QT_QTDECLARATIVE_LIBRARY} - ${QT_QTOPENGL_LIBRARY} - ${KDE4_KDEUI_LIBS} + Qt5::Declarative + Qt5::OpenGL + ${KDE4_PLASMA_LIBS} ${ACTIVEAPP_LIBRARIES} ) diff --git a/active/components/CMakeLists.txt b/active/components/CMakeLists.txt index 291648e56..e27c330fa 100644 --- a/active/components/CMakeLists.txt +++ b/active/components/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} + ${QIMAGEBLITZ_INCLUDES} ) @@ -22,7 +22,7 @@ kconfig_add_kcfg_files (okular_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc ) qt4_automoc(${okular_SRCS}) -kde4_add_library(okularplugin SHARED ${okular_SRCS}) +add_library(okularplugin SHARED ${okular_SRCS}) target_link_libraries(okularplugin Qt5::Quick Qt5::Qml diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt index bb6752c58..71e66b346 100644 --- a/generators/spectre/CMakeLists.txt +++ b/generators/spectre/CMakeLists.txt @@ -33,4 +33,4 @@ install(TARGETS okularGenerator_ghostview DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES libokularGenerator_ghostview.desktop okularGhostview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( PROGRAMS okularApplication_ghostview.desktop active-documentviewer_ghostview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -kde4_install_icons(${DATA_INSTALL_DIR}/okular/icons) +ecm_install_icons(${DATA_INSTALL_DIR}/okular/icons)