mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-15 21:17:41 +00:00
Try to fix mac build again
Ahh, I never compiled any program on Mac, i thought it will behave the same was as Linux, but there are some diferences of course..
This commit is contained in:
8
.github/workflows/build_orca.yml
vendored
8
.github/workflows/build_orca.yml
vendored
@@ -60,11 +60,13 @@ jobs:
|
|||||||
- name: Install codegen tools and generate config sources
|
- name: Install codegen tools and generate config sources
|
||||||
run: |
|
run: |
|
||||||
if [ "$(uname)" = "Linux" ]; then
|
if [ "$(uname)" = "Linux" ]; then
|
||||||
pip3 install grpcio-tools
|
pip3 install grpcio-tools pyyaml
|
||||||
|
python3 tools/run_codegen.py
|
||||||
else
|
else
|
||||||
brew install protobuf
|
python3 -m venv /tmp/codegen_venv
|
||||||
|
/tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q
|
||||||
|
/tmp/codegen_venv/bin/python tools/run_codegen.py
|
||||||
fi
|
fi
|
||||||
python3 tools/run_codegen.py
|
|
||||||
if: runner.os != 'Windows'
|
if: runner.os != 'Windows'
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
|
|||||||
@@ -181,7 +181,10 @@ function pack_deps() {
|
|||||||
|
|
||||||
function build_slicer() {
|
function build_slicer() {
|
||||||
echo "Generating config sources from proto..."
|
echo "Generating config sources from proto..."
|
||||||
python3 tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; }
|
python3 -m venv /tmp/codegen_venv
|
||||||
|
/tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q
|
||||||
|
/tmp/codegen_venv/bin/python tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; }
|
||||||
|
CODEGEN_PYTHON="/tmp/codegen_venv/bin/python3"
|
||||||
|
|
||||||
# iterate over two architectures: x86_64 and arm64
|
# iterate over two architectures: x86_64 and arm64
|
||||||
for _ARCH in x86_64 arm64; do
|
for _ARCH in x86_64 arm64; do
|
||||||
@@ -207,6 +210,7 @@ function build_slicer() {
|
|||||||
-DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
|
-DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
|
||||||
-DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
|
-DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
|
||||||
-DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
|
-DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
|
||||||
|
-DPython3_EXECUTABLE="${CODEGEN_PYTHON}" \
|
||||||
${CMAKE_POLICY_COMPAT}
|
${CMAKE_POLICY_COMPAT}
|
||||||
fi
|
fi
|
||||||
cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
|
cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
|
||||||
|
|||||||
Reference in New Issue
Block a user