diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake index 5bedf81b5..56a45d7dc 100644 --- a/CMakeModules/CalamaresAddTest.cmake +++ b/CMakeModules/CalamaresAddTest.cmake @@ -14,6 +14,7 @@ # calamares_add_test( # # [GUI] +# [RESOURCES FILE] # SOURCES # ) @@ -24,13 +25,14 @@ function( calamares_add_test ) # parse arguments (name needs to be saved before passing ARGN into the macro) set( NAME ${ARGV0} ) set( options GUI ) + set( oneValueArgs NAME RESOURCES ) set( multiValueArgs SOURCES LIBRARIES DEFINITIONS ) - cmake_parse_arguments( TEST "${options}" "" "${multiValueArgs}" ${ARGN} ) + cmake_parse_arguments( TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) set( TEST_NAME ${NAME} ) if( ECM_FOUND AND BUILD_TESTING ) ecm_add_test( - ${TEST_SOURCES} + ${TEST_SOURCES} ${TEST_RESOURCES} TEST_NAME ${TEST_NAME} LINK_LIBRARIES @@ -44,5 +46,8 @@ function( calamares_add_test ) if( TEST_GUI ) target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui ) endif() + if( TEST_RESOURCES ) + calamares_autorcc( ${TEST_NAME} ${TEST_RESOURCES} ) + endif() endif() endfunction() diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt index 40e8a85d7..e9037bc03 100644 --- a/src/modules/keyboard/CMakeLists.txt +++ b/src/modules/keyboard/CMakeLists.txt @@ -27,4 +27,6 @@ calamares_add_test( SOURCES Tests.cpp SetKeyboardLayoutJob.cpp + RESOURCES + keyboard.qrc )