Skip to content

Commit

Permalink
Revert "Disable CI on macOS for now"
Browse files Browse the repository at this point in the history
This reverts commit cad7037.
  • Loading branch information
vaintroub committed Nov 22, 2024
1 parent 0ae1133 commit 771aad1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]
os: [windows-latest, ubuntu-latest, macos-latest]
uses: ./.github/workflows/cmake-single-os.yml
with:
os: ${{ matrix.os}}
Expand Down
10 changes: 2 additions & 8 deletions cmake/BuildLuaJit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@ if(NOT WIN32)
# gmake is there´
find_program(MAKE_EXECUTABLE NAMES gmake make REQUIRED)
# Makefile requires MACOSX_DEPLOYMENT_TARGET on Apple
if (APPLE)
if("${CMAKE_OSX_DEPLOYMENT_TARGET}")
set(MACOSX_DEPLOYMENT_TARGET
if(CMAKE_OSX_DEPLOYMENT_TARGET)
set(MACOSX_DEPLOYMENT_TARGET
"MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
else()
message(WARNING "CMAKE_OSX_DEPLOYMENT_TARGET was not set")
set(MACOSX_DEPLOYMENT_TARGET
"MACOSX_DEPLOYMENT_TARGET=10.12")
endif()
endif()
set(libluajit_static_lib ${install_dir}/lib/libluajit-5.1.a)
ExternalProject_Add(
Expand Down

0 comments on commit 771aad1

Please sign in to comment.