Skip to content

Commit

Permalink
Attempt to fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
kovzol committed Jan 20, 2024
1 parent c52733c commit 86a1396
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
28 changes: 13 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
)

Expand Down

0 comments on commit 86a1396

Please sign in to comment.