From 567f84ce3758ccbba6a03066a4d0c1f555194d4b 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:16:08 +0100
Subject: [PATCH] Additional updates for cmake

---
 .github/workflows/build.yml | 41 +++++++++++++++++++++++++------------
 CMakeLists.txt              | 18 +++++++++++++++-
 CREDITS.md                  |  3 ++-
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01759eca..13b3ad6e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,22 +16,20 @@ jobs:
     - name: make
       run: make
 
-  mac:
+  linux-cmake:
 
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1
-    - name: install-qt
-      uses: jurplel/install-qt-action@v3
-      with:
-        version: '6.2.4'
-    - name: qmake
-      run: qmake
+    - name: prerequisites
+      run: sudo apt update && sudo apt install build-essential qt6-base-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools linguist-qt6 libgl1-mesa-dev
+    - name: cmake
+      run: mkdir cbuild; cmake ..
     - name: make
-      run: make
+      run: cd cbuild; make
 
-  mac-cmake:
+  mac:
 
     runs-on: macos-latest
 
@@ -41,10 +39,27 @@ jobs:
       uses: jurplel/install-qt-action@v3
       with:
         version: '6.2.4'
-    - name: cmake
-      run: mkdir cbuild; cd cbuild; cmake ..
+    - name: qmake
+      run: qmake
     - name: make
-      run: cd cbuild; 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:
+#
+#    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 4923a664..e87b321b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,22 @@
 #   where
 #   - PATH_TO_QT_SDK is the path of your Qt SDK installation (typically $HOME/Qt),
 #   - INSTALLATION_PATH is the planned installation folder of the executable and the supplementary files
-#     (typically $HOME/install/xaos),
+#     (say, $HOME/install/xaos, or, if you have root privileges, /usr),
 #   - N_PROCS is the number of processors you want to use for the compilation (if you have 8 cores,
 #     you may want to use 6).
 #
+#   You do not have to set CMAKE_PREFIX_PATH if you have the following packages installed
+#   (under Ubuntu Linux 22.04):
+#
+#   - qt6-base-dev
+#   - qt6-tools-dev
+#   - qt6-tools-dev-tools
+#   - qt6-l10n-tools
+#   - linguist-qt6
+#
+#   Also, you do not have to set INSTALLATION_PATH if you do not want to install XaoS system-wide,
+#   or you want to use the default setting (/usr/local).
+#
 # * If the compilation succeeds, you can directly type:
 #
 #   ./XaoS
@@ -28,6 +40,10 @@
 #
 #   make install
 #
+#   or, if you want to install it system-wide:
+#
+#   sudo make install
+#
 # * To run XaoS from your installation path, type:
 #
 #   cd <INSTALLATION_PATH>; ./XaoS
diff --git a/CREDITS.md b/CREDITS.md
index 527af661..7fc6f722 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -46,10 +46,11 @@
 - [Márton Török](mailto:marton.torok@gmail.com): Small fixes for pipes
 - [Pavel Tzekov](mailto:paveltz@csoft.bg): Win32 support
 - [Zuhal Ünan](mailto:zuhalu@omu.edu.tr): Turkish translation
+- [Clément Vermot](https://github.com/cvermot): Updates for French translation
 - Charles Vidal: Tcl/Tk interface
 - [Tapio K. Vocaldo](mailto:taps@rmx.com): Macintosh port
 - Tormod Volden: Fixes for X11 driver to improve compatibility with Xorg, XScreenSaver, Beryl and Compiz
-- [Clément Vermot](https://github.com/cvermot): Updates for French translation
+- [Werner Volken](werner.volken@vsw.ch): Support for cmake, quad precision support for MacOS
 - [Philippe Wautelet](mailto:p.wautelet@fractalzone.be): Bug fixes for version 3.1.1, French translation, gcc 4.0 fixes
 - [Veysel Yıldız](mailto:veyselyildiz11@gmail.com): Turkish translation
 - Sergio Zanchetta: Italian translation