Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/buildAndTest-FreeBSD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
sudo pkg install -y cmake git ${{ matrix.lua }} "$C_COMPILER_PACKAGE"
export LUA_BIN_NAME=${{ matrix.lua }}
case ${{ matrix.lua }} in
*lua55*)
bash -x scripts/buildLuaRocks.sh "5.5"
;;
*lua54*)
bash -x scripts/buildLuaRocks.sh "5.4"
;;
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/buildAndTest-MacOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ jobs:

if [[ "${{ matrix.compiler }}" = "gcc" ]]; then
brew install gcc
luarocks config "variables.CMAKE_C_COMPILER" "$(brew --prefix)/bin/gcc-13"
luarocks config "variables.CMAKE_CXX_COMPILER" "$(brew --prefix)/bin/g++-13"
luarocks config "variables.CMAKE_C_COMPILER" "$(brew --prefix)/bin/gcc-15"
luarocks config "variables.CMAKE_CXX_COMPILER" "$(brew --prefix)/bin/g++-15"
fi

luarocks install luaunit
- name: "Build Project"
run: |
if [[ "${{ matrix.compiler }}" = "gcc" ]]; then
export CXX_COMPILER="$(brew --prefix)/bin/g++-13"
export C_COMPILER="$(brew --prefix)/bin/gcc-13"
export CXX_COMPILER="$(brew --prefix)/bin/g++-15"
export C_COMPILER="$(brew --prefix)/bin/gcc-15"
else
export CXX_COMPILER="$(which clang++)"
export C_COMPILER="$(which clang)"
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Adapted from https://github.com/xpol/lua-rapidjson/blob/master/CMakeLists.txt

cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
cmake_minimum_required(VERSION 3.6.0 FATAL_ERROR)

set(FALLBACK_VERSION 0.0.1)
set(TOML++ toml++)
Expand Down Expand Up @@ -46,18 +46,18 @@ FetchContent_Declare(

FetchContent_Declare(
${SOL2}
GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
GIT_REPOSITORY "https://github.com/halx99/sol2.git"
GIT_SHALLOW ON
GIT_SUBMODULES ""
GIT_TAG "v3.5.0"
GIT_TAG "16a9fabb7ae525d644d3343f15b1de39c8865ecd"
)

FetchContent_Declare(
${MAGIC_ENUM}
GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
GIT_SHALLOW ON
GIT_SUBMODULES ""
GIT_TAG "v0.9.7"
GIT_TAG "v0.9.8"
)

FetchContent_GetProperties(${TOML++})
Expand Down
Loading
Loading