From 3e48663fb764f60db63c9272f28258fcf06eb7fb Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Wed, 2 May 2018 22:11:13 +0200 Subject: [PATCH] Use a target in FindDiscount (modern cmake) rather than variables Test Plan: Things still builds Reviewers: kde-buildsystem, apol Reviewed By: apol Subscribers: apol, aacid, #okular Tags: #okular Differential Revision: https://phabricator.kde.org/D12672 --- cmake/modules/FindDiscount.cmake | 5 +++++ generators/markdown/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindDiscount.cmake b/cmake/modules/FindDiscount.cmake index 43eac0b24..583fb0598 100644 --- a/cmake/modules/FindDiscount.cmake +++ b/cmake/modules/FindDiscount.cmake @@ -7,6 +7,7 @@ # discount_INCLUDE_DIR - the include path of the discount library # Copyright (c) 2017, Julian Wolff, +# Copyright (c) 2018, Sune Vuorela, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -34,3 +35,7 @@ endif (discount_INCLUDE_DIR AND discount_LIBRARIES) mark_as_advanced(discount_INCLUDE_DIR discount_LIBRARIES) +if (discount_FOUND) + add_library(discount::Lib UNKNOWN IMPORTED) + set_target_properties(discount::Lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${discount_INCLUDE_DIR} IMPORTED_LOCATION ${discount_LIBRARIES}) +endif() diff --git a/generators/markdown/CMakeLists.txt b/generators/markdown/CMakeLists.txt index f5fa2eced..6e8b0f1a4 100644 --- a/generators/markdown/CMakeLists.txt +++ b/generators/markdown/CMakeLists.txt @@ -16,7 +16,7 @@ set(okularGenerator_md_PART_SRCS okular_add_generator(okularGenerator_md ${okularGenerator_md_PART_SRCS}) -target_link_libraries(okularGenerator_md okularcore KF5::I18n KF5::KIOCore ${discount_LIBRARIES}) +target_link_libraries(okularGenerator_md PRIVATE okularcore KF5::I18n KF5::KIOCore discount::Lib) ########### install files ############### install( FILES okularMd.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )