Skip to content

Commit 98e727c

Browse files
committed
GHA: Don't use HomeBrew Lua on OSX
5.4 is not supported by kaguya yet an older versions are not available.
1 parent cfede4f commit 98e727c

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
if [[ "${{runner.os}}" =~ macOS ]]; then
165165
echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
166166
echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
167-
brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc lua
167+
brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc
168168
echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
169169
# Use the latest (last folder)
170170
BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ All of them can be installed with the package manager.
7575
- sdl2_mixer
7676
- gettext (make sure it is in your path with e.g. `brew link --force gettext`)
7777
- miniupnpc
78-
- lua 5.2
78+
- lua 5.1-5.3 (available via the `dev-tools` submodule included by default)
7979

8080
All of them can be installed via homebrew
8181

external/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ include(RttrTestingCfg)
66
option(RTTR_EXTERNAL_BUILD_TESTING "Enable tests of external dependencies" OFF)
77
set(BUILD_TESTING ${RTTR_EXTERNAL_BUILD_TESTING})
88

9+
set(include_devtools_default OFF)
910
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/dev-tools/CMakeLists.txt AND NOT DEFINED RTTR_INCLUDE_DEVTOOLS)
10-
message(STATUS "Precompiled binaries are available to use for development."
11-
"They are not compatible with all platforms though."
12-
"Configure with -DRTTR_INCLUDE_DEVTOOLS=ON to make them available to CMake."
13-
)
11+
if(APPLE) # Lua 5.2 required which is not easily available on OSX
12+
set(include_devtools_default ON)
13+
else()
14+
message(STATUS "Precompiled binaries are available to use for development."
15+
"They are not compatible with all platforms though."
16+
"Configure with -DRTTR_INCLUDE_DEVTOOLS=ON to make them available to CMake."
17+
)
18+
endif()
1419
endif()
1520
option(RTTR_INCLUDE_DEVTOOLS "Include folder with precompiled binaries for development" OFF)
1621
if(RTTR_INCLUDE_DEVTOOLS)

0 commit comments

Comments
 (0)