summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-11 21:18:10 +0200
committerMontel Laurent <[email protected]>2017-09-11 21:18:10 +0200
commit98cf37b6e6ab31d371f567ee6229d2ff8d29889d (patch)
treeb51d600c2b3c8eed3274ab3229b7c8e2a671b22a
parentd4033a4bf4ad531004107670e28cf8582479b74b (diff)
prison is in kf5 from long time
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/CMakeLists.txt8
2 files changed, 3 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35cf89f..48fd4b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,7 @@ add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
-find_package(KF5Prison ${KF5_VERSION} CONFIG)
-set_package_properties(Prison PROPERTIES DESCRIPTION "The Prison library" URL "http://projects.kde.org/prison" TYPE OPTIONAL PURPOSE "Needed to show mobile barcodes of your contacts")
+find_package(KF5Prison ${KF5_VERSION} CONFIG REQUIRED)
add_definitions(-DTRANSLATION_DOMAIN=\"kaddressbook\")
add_definitions(-DQT_NO_CAST_FROM_ASCII)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e75ca6..579505d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,9 +5,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/printing/
)
-if(KF5Prison_FOUND)
- add_definitions(-DHAVE_PRISON)
-endif()
+add_definitions(-DHAVE_PRISON)
if (DOMAIN_EXPERIMENTAL)
add_subdirectory(domain)
@@ -93,14 +91,12 @@ target_link_libraries(kaddressbookprivate
KF5::AkonadiSearchDebug
KF5::I18n
KF5::KaddressbookImportExport
+ KF5::Prison
)
if(QGpgme_FOUND)
target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
endif()
-if(KF5Prison_FOUND)
- target_link_libraries(kaddressbookprivate PRIVATE KF5::Prison)
-endif()
target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")