From 843a619e70276c5677bafcebde82ce2b8b2dcefa Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@ymail.com>
Date: Thu, 14 Apr 2022 03:07:08 +0200
Subject: [PATCH] Simplify translation adding

---
 CMakeLists.txt           | 17 +++++++++++++----
 cmake/Translations.cmake | 29 -----------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 cmake/Translations.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0582f93e..53905f9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,10 +580,13 @@ qt_wrap_cpp(MOC_HEADERS
 )
 
 #
-# Bundle translations.
+# Bundle resources
 #
-include(Translations)
-set(TRANSLATION_DEPS ${LANG_QRC} ${QRC} ${QM_SRC})
+if(Qt5QuickCompiler_FOUND AND COMPILE_QML)
+	qtquick_compiler_add_resources(QRC resources/res.qrc)
+else()
+	qt_add_resources(QRC resources/res.qrc)
+endif()
 
 if (APPLE)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation -framework Cocoa -framework UserNotifications")
@@ -619,7 +622,7 @@ set(NHEKO_DEPS
 	${SRC_FILES}
 	${UI_HEADERS}
 	${MOC_HEADERS}
-	${TRANSLATION_DEPS}
+	${QRC}
 	${META_FILES_TO_INCLUDE})
 
 if(ASAN)
@@ -637,6 +640,12 @@ else()
 	endif()
 endif()
 
+#
+# Bundle translations
+#
+file(GLOB LANG_TS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/langs/*.ts")
+qt_add_translations(nheko RESOURCE_PREFIX "/translations" TS_FILES ${LANG_TS_SRC})
+
 if(APPLE)
 	target_link_libraries (nheko PRIVATE Qt5::MacExtras)
 elseif(WIN32)
diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake
deleted file mode 100644
index 5f5481b2..00000000
--- a/cmake/Translations.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Generate the translation resource file
-#
-
-file(GLOB LANG_TS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/langs/*.ts")
-
-qt_add_translation(QM_SRC ${LANG_TS_SRC})
-qt_create_translation(${QM_SRC})
-add_custom_target(LANG_QRC ALL DEPENDS ${QM_SRC})
-set_target_properties(LANG_QRC PROPERTIES QT_RESOURCE_PREFIX /)
-
-# Generate a qrc file for the translations
-set(_qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
-
-if(NOT EXISTS ${_qrc})
-  file(WRITE ${_qrc} "<RCC>\n <qresource prefix=\"/translations\">\n")
-  foreach(_lang ${QM_SRC})
-    get_filename_component(_filename ${_lang} NAME)
-    file(APPEND ${_qrc} "  <file>${_filename}</file>\n")
-  endforeach(_lang)
-  file(APPEND ${_qrc} " </qresource>\n</RCC>\n")
-endif()
-
-qt_add_resources(LANG_QRC ${_qrc})
-if(Qt5QuickCompiler_FOUND AND COMPILE_QML)
-	qtquick_compiler_add_resources(QRC resources/res.qrc)
-else()
-	qt_add_resources(QRC resources/res.qrc)
-endif()