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

[libcalamares] Use Calamares interface-library to kpmcore

Browse Source
This commit is contained in:
Adriaan de Groot 2022-07-03 11:43:01 +02:00
parent fb620464d7
commit 3360ad612e
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/CMakeLists.txt
View File

@ -123,7 +123,7 @@ if(KPMcore_FOUND)
partition/PartitionIterator.cpp partition/PartitionIterator.cpp
partition/PartitionQuery.cpp partition/PartitionQuery.cpp
) )
target_link_libraries(calamares PRIVATE kpmcore) target_link_libraries(calamares PRIVATE calamares::kpmcore)
endif() endif()
### LIBRARY ### LIBRARY
@ -238,8 +238,8 @@ calamares_add_test(libcalamaresnetworktest SOURCES network/Tests.cpp)
calamares_add_test(libcalamarespackagestest SOURCES packages/Tests.cpp) calamares_add_test(libcalamarespackagestest SOURCES packages/Tests.cpp)
if(KPMcore_FOUND) if(KPMcore_FOUND)
calamares_add_test(libcalamarespartitiontest SOURCES partition/Global.cpp partition/Tests.cpp LIBRARIES kpmcore) calamares_add_test(libcalamarespartitiontest SOURCES partition/Global.cpp partition/Tests.cpp LIBRARIES calamares::kpmcore)
calamares_add_test(libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp LIBRARIES kpmcore) calamares_add_test(libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp LIBRARIES calamares::kpmcore)
endif() endif()
calamares_add_test(libcalamaresutilstest SOURCES utils/Tests.cpp utils/Runner.cpp) calamares_add_test(libcalamaresutilstest SOURCES utils/Tests.cpp utils/Runner.cpp)

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

@ -9,7 +9,7 @@ find_package(KF5WidgetsAddons CONFIG)
include(KPMcoreHelper) include(KPMcoreHelper)
if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND) 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)
# 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
@ -20,7 +20,7 @@ if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
SOURCES SOURCES
ResizeFSJob.cpp ResizeFSJob.cpp
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
kpmcore calamares::kpmcore
COMPILE_DEFINITIONS ${KPMcore_API_DEFINITIONS} COMPILE_DEFINITIONS ${KPMcore_API_DEFINITIONS}
SHARED_LIB SHARED_LIB
) )

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

@ -49,9 +49,7 @@ find_package(KF5Config CONFIG)
find_package(KF5I18n CONFIG) find_package(KF5I18n CONFIG)
find_package(KF5WidgetsAddons CONFIG) find_package(KF5WidgetsAddons CONFIG)
if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND) if(KPMcore_FOUND)
list(APPEND _partition_defs ${KPMcore_API_DEFINITIONS})
include_directories(${KPMCORE_INCLUDE_DIR})
include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui) include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
add_subdirectory(tests) add_subdirectory(tests)
@ -118,7 +116,7 @@ if(KPMcore_FOUND AND Qt5DBus_FOUND AND KF5CoreAddons_FOUND AND KF5Config_FOUND)
gui/ReplaceWidget.ui gui/ReplaceWidget.ui
gui/VolumeGroupBaseDialog.ui gui/VolumeGroupBaseDialog.ui
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
kpmcore calamares::kpmcore
KF5::CoreAddons KF5::CoreAddons
COMPILE_DEFINITIONS ${_partition_defs} COMPILE_DEFINITIONS ${_partition_defs}
SHARED_LIB SHARED_LIB

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

@ -25,14 +25,14 @@ calamares_add_test(
${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
LIBRARIES kpmcore LIBRARIES calamares::kpmcore
DEFINITIONS ${_partition_defs} DEFINITIONS ${_partition_defs}
) )
calamares_add_test( calamares_add_test(
partitionclearmountsjobtest partitionclearmountsjobtest
SOURCES ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp ClearMountsJobTests.cpp SOURCES ${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp ClearMountsJobTests.cpp
LIBRARIES kpmcore LIBRARIES calamares::kpmcore
DEFINITIONS ${_partition_defs} DEFINITIONS ${_partition_defs}
) )
@ -45,7 +45,7 @@ calamares_add_test(
${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp ${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp ${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
LIBRARIES kpmcore Calamares::calamaresui LIBRARIES calamares::kpmcore Calamares::calamaresui
DEFINITIONS ${_partition_defs} DEFINITIONS ${_partition_defs}
) )
@ -58,6 +58,6 @@ calamares_add_test(
calamares_add_test( calamares_add_test(
partitiondevicestest partitiondevicestest
SOURCES DevicesTests.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp SOURCES DevicesTests.cpp ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
LIBRARIES kpmcore LIBRARIES calamares::kpmcore
DEFINITIONS ${_partition_defs} DEFINITIONS ${_partition_defs}
) )