From 86a13969bcf30ec0e956b9ad19ae6df3f2e94242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Kov=C3=A1cs?= <zoltan@geogebra.org>
Date: Sat, 20 Jan 2024 18:56:26 +0100
Subject: [PATCH] Attempt to fix build issues

---
 .github/workflows/build.yml | 28 +++++++++++++---------------
 CMakeLists.txt              | 10 ++++++----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fd8e89a6..90e2066c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,22 +44,20 @@ jobs:
     - name: make
       run: make
 
-# Temporarily disabled (GitHub Actions stops with "make[2]: *** No rule to make target `/Users/runner/work/XaoS/XaoS/i18n/XaoS_fr.qm', needed by `XaoS_autogen/EWIEGA46WW/qrc_XaoS.cpp'.  Stop."):
+  mac-cmake:
 
-#  mac-cmake:
-#
-#    runs-on: macos-latest
-#
-#    steps:
-#    - uses: actions/checkout@v1
-#    - name: install-qt
-#      uses: jurplel/install-qt-action@v3
-#      with:
-#        version: '6.2.4'
-#    - name: cmake
-#      run: mkdir cbuild; cd cbuild; cmake ..
-#    - name: make
-#      run: cd cbuild; make
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: install-qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: '6.2.4'
+    - name: cmake
+      run: mkdir cbuild; cd cbuild; cmake ..
+    - name: make
+      run: cd cbuild; make
 
 # This requires too much disk space (more than 40 GB), so it is disabled for now:
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e87b321b..9e56593a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,11 +106,13 @@ set(XaoS_ICON ${CMAKE_CURRENT_SOURCE_DIR}/src/ui/XaoS.icns)
 set_source_files_properties(${XaoS_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 # Multilingual support: *.ts -> build/*.qm
-FIND_PACKAGE(Qt${QT_VERSION_MAJOR}LinguistTools)
+FIND_PACKAGE(Qt6LinguistTools)
 file(GLOB TRANSLATION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/i18n/*.ts)
 
 # qt_add_translation
-qt_add_translation(QM_FILES ${TRANSLATION_FILES})
+set_source_files_properties(${TRANSLATION_FILES}
+    PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/i18n")
+qt6_add_translation(QM_FILES ${TRANSLATION_FILES})
 
 # grab all sources for executable
 file(GLOB CXX_FILES src/ui/*.cpp src/ui-hlp/*.cpp src/util/*.cpp src/engine/*.cpp src/sffe/*.cpp)
@@ -126,8 +128,8 @@ add_executable(XaoS MACOSX_BUNDLE
 
 # Link
 target_link_libraries(XaoS
-   Qt${QT_VERSION_MAJOR}::Widgets
-   Qt${QT_VERSION_MAJOR}::PrintSupport
+   Qt6::Widgets
+   Qt6::PrintSupport
    quadmath
 )