From 61ca6384ccf6576cc9ea10f221009f39670f41ca Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 20 Feb 2020 22:51:24 +0100 Subject: [PATCH] [partition] Fix tests - One of the files listed in the test has moved (to libcalamares), - Don't bother with an extra intermediate SRCS variable. --- src/modules/partition/tests/CMakeLists.txt | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index a64d7620e..0bd559fd1 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -2,18 +2,6 @@ find_package( Qt5 COMPONENTS Gui REQUIRED ) set( PartitionModule_SOURCE_DIR .. ) -set( partitionjobtests_SRCS - ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp - ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp - ${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp - ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp - ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp - PartitionJobTests.cpp -) - include_directories( ${Qt5Gui_INCLUDE_DIRS} ${PartitionModule_SOURCE_DIR} @@ -23,7 +11,15 @@ include_directories( calamares_add_test( partitionjobtests - SOURCES ${partitionjobtests_SRCS} + SOURCES + PartitionJobTests.cpp + ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp + ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp + ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp + ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp LIBRARIES kpmcore DEFINITIONS ${_partition_defs}