Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatic builds for apple silicon fix #4165

Open
wants to merge 3 commits into
base: master_dev
Choose a base branch
from
Open

Automatic builds for apple silicon fix #4165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c886c
apple silicon build fix
glsorre Feb 28, 2024
976d569
apple silicon build test
glsorre Feb 29, 2024
c658aef
apple silicon build test with b flag
glsorre Mar 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_mac_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: macos-11
runs-on: macos-14

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_mac_arm_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: macos-11
runs-on: macos-14

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_mac_arm_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: macos-11
runs-on: macos-14

steps:
- uses: actions/checkout@v2
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/debug_mac_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: C/C++ debug arm macos

on:
push:
branches:
- pr1

jobs:
build:

runs-on: macos-14

steps:
- uses: actions/checkout@v2
- name: build deps & slicer
run: ./BuildMacOS.sh -bia
- name: Upload artifact
uses: actions/[email protected]
with:
name: nightly_macos_arm_debug.dmg
path: build/${{ github.event.repository.name }}.dmg
- name: Upload artifact
uses: actions/[email protected]
with:
name: nightly_arm_macos.tar
path: build/${{ github.event.repository.name }}.tar
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ if(WIN32)
endif()

if (APPLE)
add_compile_options(-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
if (CMAKE_OSX_DEPLOYMENT_TARGET)
message("OS X Deployment Target: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/FindNLopt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(NOT NLopt_DIR)

set(NLopt_FOUND TRUE)

set(_NLopt_LIB_NAMES "nlopt")
set(_NLopt_LIB_NAMES "nlopt" "nloptd")
find_library(NLopt_LIBS
NAMES ${_NLopt_LIB_NAMES})
if(NOT NLopt_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion deps/TIFF/TIFF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if (APPLE)
if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
prusaslicer_add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip
URL_HASH SHA256=a1db6826ea1b8b08eaf168973abb29b8a143fb744c1b24cc6967cb12f5e6e81f
URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726
DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
CMAKE_ARGS
-Dlzma:BOOL=OFF
Expand Down