applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-03-01 13:25:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] [fsresizer] For simplicity, disallow beta KPMcore

Browse source
This commit is contained in:
Adriaan de Groot 2019-06-13 11:45:20 +02:00
parent 83d296bcd0
commit f1822c2adb
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/modules/fsresizer/CMakeLists.txt
View file

@ -8,11 +8,10 @@ if ( KPMcore_FOUND )
include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition ) include_directories( ${KPMCORE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/modules/partition )
if ( KPMcore_VERSION VERSION_GREATER "3.3.0") if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0" )
list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
endif()
if ( KPMcore_VERSION VERSION_GREATER "3.90")
list( APPEND _partition_defs WITH_KPMCORE4API ) # kpmcore 4 with new API list( APPEND _partition_defs WITH_KPMCORE4API ) # kpmcore 4 with new API
elseif( KPMcore_VERSION VERSION_GREATER "3.3.70" )
message( FATAL_ERROR "KPMCore beta versions are not supported" )
endif() endif()
# The PartitionIterator is a small class, and it's easiest -- but also a # The PartitionIterator is a small class, and it's easiest -- but also a

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

@ -25,11 +25,10 @@ if ( KPMcore_FOUND )
find_package( Qt5 REQUIRED DBus ) find_package( Qt5 REQUIRED DBus )
find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons ) find_package( KF5 REQUIRED Config CoreAddons I18n WidgetsAddons )
if ( KPMcore_VERSION VERSION_GREATER "3.3.0") if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0" )
list( APPEND _partition_defs WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
endif()
if ( KPMcore_VERSION VERSION_GREATER "3.90")
list( APPEND _partition_defs WITH_KPMCORE4API ) # kpmcore 4 with new API list( APPEND _partition_defs WITH_KPMCORE4API ) # kpmcore 4 with new API
elseif( KPMcore_VERSION VERSION_GREATER "3.3.70" )
message( FATAL_ERROR "KPMCore beta versions are not supported" )
endif() endif()
include_directories( ${KPMCORE_INCLUDE_DIR} ) include_directories( ${KPMCORE_INCLUDE_DIR} )