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

Partitionmanager: partly fix PM-tests build

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-20 07:10:29 -04:00 committed by Philip
parent ffb599ff36
commit 8373620cca
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,10 @@ if( NOT blkid_LIB )
endif() endif()
add_subdirectory( tests )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
include_directories( ${KPMCORE_INCLUDE_DIR} ) include_directories( ${KPMCORE_INCLUDE_DIR} )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
add_subdirectory( tests )
calamares_add_plugin( partition calamares_add_plugin( partition
TYPE viewmodule TYPE viewmodule

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

@ -1,4 +1,6 @@
find_package( Qt5 COMPONENTS Test REQUIRED ) find_package( Qt5 COMPONENTS Gui Test REQUIRED )
find_package( KF5 COMPONENTS Service REQUIRED )
include( ECMAddTests ) include( ECMAddTests )
set( PartitionModule_SOURCE_DIR .. ) set( PartitionModule_SOURCE_DIR .. )
@ -18,8 +20,10 @@ set( partitionjobtests_SRCS
) )
include_directories( include_directories(
${Qt5Gui_INCLUDE_DIRS}
${PartitionModule_SOURCE_DIR} ${PartitionModule_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
) )
ecm_add_test( ${partitionjobtests_SRCS} ecm_add_test( ${partitionjobtests_SRCS}
@ -29,6 +33,7 @@ ecm_add_test( ${partitionjobtests_SRCS}
${CALAMARES_LIBRARIES} ${CALAMARES_LIBRARIES}
Qt5::Core Qt5::Core
Qt5::Test Qt5::Test
KF5::Service
) )
set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE ) set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )