From 030e6a203415556e102ec883a08f9d8be15f4a91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 16 Sep 2021 01:06:35 +0200 Subject: [PATCH] Source required packages before adding target The config script for adding the target (which is generated by CMake) otherwise complains that referenced dependencies are missing. Not sure why this was never a problem. Maybe the packages were just present anyways or CMake added additional checks at some point. --- cmake/templates/Config.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/templates/Config.cmake.in b/cmake/templates/Config.cmake.in index 47a5593..7ed85e1 100644 --- a/cmake/templates/Config.cmake.in +++ b/cmake/templates/Config.cmake.in @@ -43,9 +43,6 @@ set(@META_PROJECT_VARNAME_UPPER@_LIB "@META_TARGET_NAME@") set(@META_PROJECT_VARNAME_UPPER@_LIB_IS_SHARED "@BUILD_SHARED_LIBS@") set(@META_PROJECT_VARNAME_UPPER@_STATIC_LINKAGE "@STATIC_LINKAGE_CONFIGURED@") if(NOT TARGET "${@META_PROJECT_VARNAME_UPPER@_LIB}") - # add target for the library itself - include("${CMAKE_CURRENT_LIST_DIR}/@META_PROJECT_NAME@@META_CONFIG_SUFFIX@Targets.cmake") - # make dependencies of the library available # caveat: This currently does *not* cover Qt and KF modules which are so far only handled # separately when using the function use_@META_PROJECT_VARNAME@. @@ -105,6 +102,9 @@ if(NOT TARGET "${@META_PROJECT_VARNAME_UPPER@_LIB}") set(PKG_CONFIG_USE_STATIC_LIBS ${@META_PROJECT_VARNAME_UPPER@_DEFAULT_PKG_CONFIG_USE_STATIC_LIBS}) unset(@META_PROJECT_VARNAME_UPPER@_DEFAULT_PKG_CONFIG_USE_STATIC_LIBS) endif () + + # add target for the library itself + include("${CMAKE_CURRENT_LIST_DIR}/@META_PROJECT_NAME@@META_CONFIG_SUFFIX@Targets.cmake") endif() # define function to ease use of library in projects following conventions of c++utilities' build script