applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-21 14:47:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake: massage finding-of-things to be less demanding

Browse source 
1- Need to be careful switching dependencies from REQUIRED to OPTIONAL
2- Don't do ECM REQUIRED all over the place
3- Workaround neon CI not having KCrash (which translated to KF5 not
   found, which translated to a missing REQUIRED dependency, see 1).
This commit is contained in:
Adriaan de Groot 2023-09-10 21:08:34 +02:00
parent 63b7ecb97e
commit 8925c34ff7
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -334,7 +334,7 @@ set_package_properties(
# Find ECM once, and add it to the module search path; Calamares
# modules that need ECM can do
# find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE),
# if(ECM_FOUND)
# no need to mess with the module path after.
find_package(ECM ${ECM_VERSION} NO_MODULE)
if(ECM_FOUND)
@ -348,7 +348,7 @@ if(ECM_FOUND)
include(KDEInstallDirs)
endif()
find_package(${kfname} ${KF_VERSION} QUIET REQUIRED COMPONENTS CoreAddons)
find_package(${kfname}CoreAddons ${KF_VERSION} QUIET REQUIRED)
# After this point, there should be no REQUIRED find_packages,
# since we want tidy reporting of optional dependencies.
@ -356,7 +356,7 @@ find_package(${kfname} ${KF_VERSION} QUIET REQUIRED COMPONENTS CoreAddons)
# OPTIONAL DEPENDENCIES
#
# First, set KF back to optional so that any missing components don't trip us up.
find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons Crash)
find_package(${kfname}Crash ${KF_VERSION} QUIET)
if(NOT TARGET ${kfname}::Crash)
if(BUILD_CRASH_REPORTING)
@ -568,7 +568,7 @@ add_feature_info(KCrash ${BUILD_CRASH_REPORTING} "Crash dumps via KCrash")
### Post-source configuration
#
#
find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons Crash)
find_package(${kfname} ${KF_VERSION} QUIET COMPONENTS CoreAddons)
### CMake infrastructure installation
#

2
src/modules/interactiveterminal/CMakeLists.txt
View file

@ -8,8 +8,6 @@ if(WITH_QT6)
return()
endif()
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
set(kf5_ver 5.41)
find_package(KF5Service ${kf5_ver})

2
src/modules/partition/CMakeLists.txt
View file

@ -41,8 +41,6 @@ if(DEBUG_PARTITION_SKIP)
list(APPEND _partition_defs DEBUG_PARTITION_SKIP)
endif()
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
include(KPMcoreHelper)
if(KPMcore_FOUND)

2
src/modules/plasmalnf/CMakeLists.txt
View file

@ -8,8 +8,6 @@ if(WITH_QT6)
return()
endif()
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
# Requires a sufficiently recent Plasma framework, but also
# needs a runtime support component (which we don't test for).