napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: massage dependency-finding

Browse Source 
- If KPMCore is not found, don't require the KF5 components
   that it would depend on.
 - If ECM is found, use KDEInstallDirs always, not just when
   the partitioning module is used.
This commit is contained in:
Adriaan de Groot 2019-04-30 13:38:46 +02:00
parent 2620829515
commit a01262a535
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -269,6 +269,7 @@ if( ECM_FOUND )
find_package( Qt5 COMPONENTS Test REQUIRED ) find_package( Qt5 COMPONENTS Test REQUIRED )
include( ECMAddTests ) include( ECMAddTests )
endif() endif()
include(KDEInstallDirs)
endif() endif()
find_package( KF5 COMPONENTS CoreAddons Crash ) find_package( KF5 COMPONENTS CoreAddons Crash )

5
src/modules/fsresizer/CMakeLists.txt
View File

@ -1,10 +1,11 @@
find_package( KPMcore 3.3 ) find_package( KPMcore 3.3 )
find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore
find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore
set( _partition_defs "" ) set( _partition_defs "" )
if ( KPMcore_FOUND ) if ( KPMcore_FOUND )
find_package( Qt5 REQUIRED DBus ) # Needed for KPMCore
find_package( KF5 REQUIRED I18n WidgetsAddons ) # Needed for KPMCore
include_directories( ${KPMCORE_INCLUDE_DIR} ) include_directories( ${KPMCORE_INCLUDE_DIR} )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamares ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamares )

8
src/modules/partition/CMakeLists.txt
View File

@ -15,11 +15,6 @@ endif()
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
include(KDEInstallDirs)
include(GenerateExportHeader)
find_package( Qt5 REQUIRED DBus )
find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
find_package( KPMcore 3.3 ) find_package( KPMcore 3.3 )
set_package_properties( set_package_properties(
KPMcore PROPERTIES KPMcore PROPERTIES
@ -27,6 +22,9 @@ set_package_properties(
) )
if ( KPMcore_FOUND ) if ( KPMcore_FOUND )
find_package( Qt5 REQUIRED DBus )
find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
if ( KPMcore_VERSION VERSION_GREATER "3.3.0") if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
endif() endif()