summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-01-11 07:21:42 (GMT)
committerMontel Laurent <montel@kde.org>2015-01-11 07:21:42 (GMT)
commit73ccfdefb72b7e671004e5a0cfb95330e2634e78 (patch)
treeadc75863238726c7d0e4ddd1ffdfe98145ad546f
parente9921b6dd5a973d93ee2a726cbb22d5289d99f39 (diff)
Fix cmakelists.txt
-rw-r--r--active/app/CMakeLists.txt2
-rw-r--r--active/app/src/CMakeLists.txt10
-rw-r--r--active/components/CMakeLists.txt4
-rw-r--r--generators/spectre/CMakeLists.txt2
4 files changed, 9 insertions, 9 deletions
diff --git a/active/app/CMakeLists.txt b/active/app/CMakeLists.txt
index dd0c75d..8c27bb7 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 1004dbd..2384460 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 291648e..e27c330 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 bb6752c..71e66b3 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)