Skip to content

Commit

Permalink
Additional updates for cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
kovzol committed Jan 20, 2024
1 parent 2f1c438 commit 567f84c
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 15 deletions.
41 changes: 28 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:

Expand Down
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@
- [Márton Török](mailto:[email protected]): Small fixes for pipes
- [Pavel Tzekov](mailto:[email protected]): Win32 support
- [Zuhal Ünan](mailto:[email protected]): Turkish translation
- [Clément Vermot](https://github.com/cvermot): Updates for French translation
- Charles Vidal: Tcl/Tk interface
- [Tapio K. Vocaldo](mailto:[email protected]): 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]([email protected]): Support for cmake, quad precision support for MacOS
- [Philippe Wautelet](mailto:[email protected]): Bug fixes for version 3.1.1, French translation, gcc 4.0 fixes
- [Veysel Yıldız](mailto:[email protected]): Turkish translation
- Sergio Zanchetta: Italian translation
Expand Down

0 comments on commit 567f84c

Please sign in to comment.