From ca037af6ca91733e1cd5804be6e05db5bcf637b7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 30 Sep 2017 16:48:37 +0200 Subject: [PATCH] KPMCore: update required version to 3.2 - drop extra checks for blkid and atasmart, those are kpmcore's concern, not ours (and it might have other backends, anyway) --- src/modules/partition/CMakeLists.txt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 1ea69c027..8509ec25d 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -8,20 +8,7 @@ find_package( KF5 REQUIRED CoreAddons ) # These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service find_package( KF5 REQUIRED Config I18n IconThemes KIO Service ) -find_package( KPMcore 3.1.50 QUIET ) -if ( ${KPMcore_FOUND} ) - add_definitions(-DWITH_KPMCORE22) -endif() -find_package( KPMcore 3.0.3 REQUIRED ) -find_library( atasmart_LIB atasmart ) -find_library( blkid_LIB blkid ) -if( NOT atasmart_LIB ) - message( WARNING "atasmart library not found." ) -endif() -if( NOT blkid_LIB ) - message( WARNING "blkid library not found." ) -endif() - +find_package( KPMcore 3.2 REQUIRED ) include_directories( ${KPMCORE_INCLUDE_DIR} ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )