Use new automoc options

main
Adriaan de Groot 6 years ago
parent bdb7bf71a8
commit 123c774a47

@ -38,10 +38,10 @@ set( final_src ${calamaresSources} ${calamaresRc} ${trans_outfile} )
add_executable( calamares_bin ${final_src} )
set_target_properties(calamares_bin
PROPERTIES
AUTOMOC TRUE
ENABLE_EXPORTS TRUE
RUNTIME_OUTPUT_NAME calamares
)
calamares_automoc( calamares_bin )
if( WITH_KF5Crash )
set( LINK_LIBRARIES

@ -21,5 +21,5 @@ if( ECM_FOUND AND BUILD_TESTING )
Qt5::Core
Qt5::Test
)
set_target_properties( contextualprocesstest PROPERTIES AUTOMOC TRUE )
calamares_automoc( contextualprocesstest )
endif()

@ -54,7 +54,7 @@ if( ECM_FOUND AND BUILD_TESTING )
${geoip_libs}
${YAMLCPP_LIBRARY}
)
set_target_properties( geoiptest PROPERTIES AUTOMOC TRUE )
calamares_automoc( geoiptest )
ecm_add_test(
Tests.cpp
@ -65,10 +65,11 @@ if( ECM_FOUND AND BUILD_TESTING )
calamares
Qt5::Test
)
set_target_properties( localetest PROPERTIES AUTOMOC TRUE )
calamares_automoc( localetest )
endif()
if( BUILD_TESTING )
add_executable( test_geoip test_geoip.cpp ${geoip_src} )
target_link_libraries( test_geoip calamaresui Qt5::Network ${geoip_libs} ${YAMLCPP_LIBRARY} )
calamares_automoc( test_geoip )
endif()

@ -20,5 +20,5 @@ if( ECM_FOUND AND BUILD_TESTING )
Qt5::Core
Qt5::Test
)
set_target_properties( shellprocesstest PROPERTIES AUTOMOC TRUE )
calamares_automoc( shellprocesstest )
endif()

@ -51,5 +51,5 @@ if( ECM_FOUND AND BUILD_TESTING )
Qt5::Test
${CRYPT_LIBRARIES}
)
set_target_properties( passwordtest PROPERTIES AUTOMOC TRUE )
calamares_automoc( passwordtest )
endif()

Loading…
Cancel
Save