office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-05 23:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

lik to okularcore and okularpart instead of including the settings code multiple times, which breaks the exports

Browse source
This commit is contained in:
Patrick von Reth 2015-01-23 13:24:09 +01:00
parent dee5b8b006
commit 49c28f52df
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
active/components/CMakeLists.txt
View file

@ -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)

3
generators/kimgio/CMakeLists.txt
View file

@ -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 ###############