X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=cmake%2FQuasselMacros.cmake;h=02b3165b831fa0cf542f5f5036b210e409223e33;hp=318defb85e7af23543823fbb610240c4fdf95b0b;hb=d9e586707522241d628a90466e13722e342cc28a;hpb=a7acde8447823f9cd5f25aae569a1ec3a0174073

diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake
index 318defb8..02b3165b 100644
--- a/cmake/QuasselMacros.cmake
+++ b/cmake/QuasselMacros.cmake
@@ -7,6 +7,7 @@
 ###################################################################################################
 
 include(CMakeParseArguments)
+include(QuasselCompileFeatures)
 
 ###################################################################################################
 # Adds a library target for a Quassel module.
@@ -41,6 +42,8 @@ function(quassel_add_module _module)
         PRIVATE ${CMAKE_CURRENT_BINARY_DIR} # for generated files
     )
 
+    target_compile_features(${target} PUBLIC ${QUASSEL_COMPILE_FEATURES})
+
     # Export the target name for further use
     set(TARGET ${target} PARENT_SCOPE)
 endfunction()
@@ -158,38 +161,3 @@ function(target_link_if_exists _target)
         endforeach()
     endif()
 endfunction()
-
-######################################
-# Macros for dealing with translations
-######################################
-
-# This generates a .ts from a .po file
-macro(generate_ts outvar basename)
-  set(input ${basename}.po)
-  set(output ${CMAKE_BINARY_DIR}/po/${basename}.ts)
-  add_custom_command(OUTPUT ${output}
-          COMMAND $<TARGET_PROPERTY:Qt5::lconvert,LOCATION>
-          ARGS -i ${input}
-               -of ts
-               -o ${output}
-          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po
-# This is a workaround to add (duplicate) strings that lconvert missed to the .ts
-          COMMAND $<TARGET_PROPERTY:Qt5::lupdate,LOCATION>
-          ARGS -silent
-               ${CMAKE_SOURCE_DIR}/src/
-               -ts ${output}
-          DEPENDS ${basename}.po)
-  set(${outvar} ${output})
-endmacro(generate_ts outvar basename)
-
-# This generates a .qm from a .ts file
-macro(generate_qm outvar basename)
-  set(input ${CMAKE_BINARY_DIR}/po/${basename}.ts)
-  set(output ${CMAKE_BINARY_DIR}/po/${basename}.qm)
-  add_custom_command(OUTPUT ${output}
-          COMMAND $<TARGET_PROPERTY:Qt5::lrelease,LOCATION>
-          ARGS -silent
-               ${input}
-          DEPENDS ${basename}.ts)
-  set(${outvar} ${output})
-endmacro(generate_qm outvar basename)