From a433e8b127ac131893282a4bc4369f20f8d661f5 Mon Sep 17 00:00:00 2001 From: Treeve Jelbert Date: Fri, 29 Apr 2016 11:10:08 +0200 Subject: [PATCH] KF5DesignerPlugin optional --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62b43aa..fceb34b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,11 +29,6 @@ ecm_setup_version(${KPIMTEXTEDIT_LIB_VERSION} VARIABLE_PREFIX KPIMTEXTEDIT set(QT_REQUIRED_VERSION "5.4.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test Widgets DBus) find_package(Grantlee5 "5.0" CONFIG REQUIRED) -find_package(Qt5Designer NO_MODULE) -set_package_properties(Qt5Designer PROPERTIES - PURPOSE "Required to build the Qt Designer plugins" - TYPE OPTIONAL -) ########### Find packages ########### @@ -48,7 +43,11 @@ find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG REQUIRED) + +find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG) +if(KF5DesignerPlugin_FOUND) + find_package(Qt5Designer CONFIG REQUIRED) +endif() add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\") add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") -- 2.8.0