From 604535f65a36a67bbf934cc056c648a79a6d03ba Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 23 Jul 2021 17:26:42 +0200 Subject: [PATCH] CMake: find YAMLCPP when asked to find Calamares --- CalamaresConfig.cmake.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CalamaresConfig.cmake.in b/CalamaresConfig.cmake.in index f10fda11a..4fb9621ca 100644 --- a/CalamaresConfig.cmake.in +++ b/CalamaresConfig.cmake.in @@ -27,6 +27,9 @@ if (NOT TARGET Calamares::calamares OR NOT TARGET Calamares::calamaresui) message(FATAL_ERROR "Calamares found with missing CMake targets") endif() +# Need various CMake files that are installed alongside this one. +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + ### Dependencies # # The libraries can depend on a variety of Qt and KDE Frameworks @@ -60,6 +63,8 @@ if(kf5_required) endif() endif() +find_package(YAMLCPP REQUIRED) + ### Legacy support # # @@ -70,8 +75,6 @@ set(Calamares_LIBRARIES Calamares::calamares) ### CMake support # # -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - include(CalamaresAddBrandingSubdirectory) include(CalamaresAddLibrary) include(CalamaresAddModuleSubdirectory)