summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <luigi.toscano@tiscali.it>2016-10-29 15:51:18 (GMT)
committerLuigi Toscano <luigi.toscano@tiscali.it>2016-10-29 16:07:30 (GMT)
commit58b2f0e1f06c28377b506f564185431444e114a4 (patch)
tree2d0620f1e9e50ddd929a82214b95768cd4261480
parent34ea79c2c31810ba0ce3ba9b17e03b33a28e6175 (diff)
Use QMobipocket >= 2 (Qt5 based)
Use the new way of finding it, as include and libraries directories are not exported, but the target information are and can be used through target_link_libraries..
-rw-r--r--generators/CMakeLists.txt6
-rw-r--r--generators/mobipocket/CMakeLists.txt4
2 files changed, 4 insertions, 6 deletions
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 3a223ab..3e48b20 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -76,10 +76,10 @@ set_package_properties("libepub" PROPERTIES
TYPE RECOMMENDED
PURPOSE "Support for EPub documents in Okular.")
-find_package(QMobipocket)
+find_package(QMobipocket "2")
set_package_properties("libqmobipocket" PROPERTIES
DESCRIPTION "A library for reading Mobipocket documents"
- URL "https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
+ URL "https://commits.kde.org/kdegraphics-mobipocket"
TYPE RECOMMENDED
PURPOSE "Support for Mobipocket documents in Okular.")
@@ -131,6 +131,6 @@ endif(EPUB_FOUND)
add_subdirectory(txt)
-if(QMOBIPOCKET_FOUND)
+if(QMobipocket_FOUND)
add_subdirectory(mobipocket)
endif()
diff --git a/generators/mobipocket/CMakeLists.txt b/generators/mobipocket/CMakeLists.txt
index 83adf81..059dd35 100644
--- a/generators/mobipocket/CMakeLists.txt
+++ b/generators/mobipocket/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories( ${QMOBIPOCKET_INCLUDE_DIR} )
-
########### next target ###############
set(okularGenerator_mobi_PART_SRCS
@@ -10,7 +8,7 @@ set(okularGenerator_mobi_PART_SRCS
okular_add_generator(okularGenerator_mobi ${okularGenerator_mobi_PART_SRCS})
-target_link_libraries(okularGenerator_mobi okularcore ${QMOBIPOCKET_LIBRARIES} KF5::I18n Qt5::Gui)
+target_link_libraries(okularGenerator_mobi okularcore qmobipocket KF5::I18n Qt5::Gui)
########### install files ###############
install( FILES okularMobi.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )