From 801873b216e5a53c49e2eeaf90e7a7f32a4433ce Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 24 Apr 2014 04:28:30 +1000 Subject: [PATCH] Fix configure failure when optional packages are missing. When find_package(KF5 CONFIG REQUIRED) is called, any subsequent find_package(KF5) calls will be marked as required too. So, find optional frameworks separately to avoid configure failure if they are missing. Also add information about the status of the optional packages to the feature summary. REVIEW: 117728 --- CMakeLists.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2334ffc22e..c8ef85ed3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,19 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS ) # optional frameworks -find_package(KF5 CONFIG COMPONENTS Activities DocTools) +find_package(KF5Activities CONFIG) +set_package_properties(KF5Activities PROPERTIES + PURPOSE "Enable building of KWin with kactivities support" + TYPE OPTIONAL + ) +add_feature_info("KF5Activities" KF5Activities_FOUND "Enable building of KWin with kactivities support") + +find_package(KF5DocTools CONFIG) +set_package_properties(KF5DocTools PROPERTIES + PURPOSE "Enable building documentation" + TYPE OPTIONAL + ) +add_feature_info("KF5DocTools" KF5DocTools_FOUND "Enable building documentation") if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL") find_package(OpenGL)