Skip to content
This repository has been archived by the owner on Apr 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #13 from lat9nq/no_gettext
Browse files Browse the repository at this point in the history
CMake: Disable gettext
  • Loading branch information
lat9nq committed Nov 29, 2023
2 parents 0d17dd0 + 55ffd1e commit f668009
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: ubuntu-latest
strategy:
matrix:
platform: [ubuntu-latest,macos-latest]
runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v3
Expand All @@ -36,7 +39,7 @@ jobs:
- name: Package
run: |
mkdir -p ${{github.workspace}}/artifacts
cp -rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
cp -Rv ${{ env.nx_tzdb_dir }} ${{github.workspace}}/artifacts/
- name: Version
run: |
Expand All @@ -45,5 +48,5 @@ jobs:
- name: Upload
uses: actions/upload-artifact@v3
with:
name: ${{ env.nx_version }}
name: ${{ env.nx_version }}_${{ matrix.platform }}
path: artifacts/nx
10 changes: 9 additions & 1 deletion externals/tz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,22 @@ if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}")
# separate directory before building.
file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR})

if (APPLE)
set(TZ_MAKEFLAGS "LDLIBS=-lintl")
else()
set(TZ_MAKEFLAGS)
endif()

execute_process(
COMMAND
${GNU_MAKE} DESTDIR=${TZ_DIR} install
${GNU_MAKE} DESTDIR=${TZ_DIR} ${TZ_MAKEFLAGS} install
WORKING_DIRECTORY
${TZ_TMP_SOURCE_DIR}
COMMAND_ERROR_IS_FATAL ANY
)

unset(TZ_MAKEFLAGS)

# Step taken by Arch Linux packaging, but Nintendo apparently skips it
# execute_process(
# COMMAND
Expand Down

0 comments on commit f668009

Please sign in to comment.