summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick von Reth <vonreth@kde.org>2015-01-23 12:24:09 (GMT)
committerPatrick von Reth <vonreth@kde.org>2015-01-23 12:24:09 (GMT)
commit49c28f52dfc8391781a2b262092ed8e7a01e9111 (patch)
treebc95c398f143dd31e7d690777f56f73df758c579
parentdee5b8b00634c9293b292c959ecb83b3e448f40e (diff)
lik to okularcore and okularpart instead of including the settings code multiple times, which breaks the exports
-rw-r--r--active/components/CMakeLists.txt4
-rw-r--r--generators/kimgio/CMakeLists.txt3
2 files changed, 2 insertions, 5 deletions
diff --git a/active/components/CMakeLists.txt b/active/components/CMakeLists.txt
index e27c330..402f18d 100644
--- a/active/components/CMakeLists.txt
+++ b/active/components/CMakeLists.txt
@@ -10,7 +10,6 @@ include_directories(
set(okular_SRCS
okularplugin.cpp
- ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp
${CMAKE_SOURCE_DIR}/ui/guiutils.cpp
${CMAKE_SOURCE_DIR}/ui/tocmodel.cpp
pageitem.cpp
@@ -18,8 +17,6 @@ set(okular_SRCS
thumbnailitem.cpp
)
-kconfig_add_kcfg_files (okular_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc )
-
qt4_automoc(${okular_SRCS})
add_library(okularplugin SHARED ${okular_SRCS})
@@ -30,6 +27,7 @@ target_link_libraries(okularplugin
Qt5::Xml
Qt5::Svg
okularcore
+ okularpart
)
install(TARGETS okularplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/okular)
diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
index 14471da..f10d86f 100644
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@@ -13,8 +13,7 @@ install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR})
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp )
-kconfig_add_kcfg_files( kimgiotest_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc )
-ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore Qt5::Svg Qt5::Test)
+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
########### install files ###############