diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index cae89a96bc..5893895afe 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -59,9 +59,10 @@ jobs: - name: Install codegen tools and generate config sources run: | - python3 -m venv /tmp/codegen_venv - /tmp/codegen_venv/bin/pip install grpcio-tools - /tmp/codegen_venv/bin/python tools/run_codegen.py + if [ "$(uname)" = "Linux" ]; then + pip3 install grpcio-tools + fi + python3 tools/run_codegen.py if: runner.os != 'Windows' shell: bash @@ -113,7 +114,7 @@ jobs: if: runner.os == 'macOS' && !inputs.macos-combine-only run: | if [ -z "${{ vars.SELF_HOSTED }}" ]; then - brew install libtool + brew install libtool protobuf brew list fi mkdir -p ${{ github.workspace }}/deps/build/${{ inputs.arch }} diff --git a/CMakeLists.txt b/CMakeLists.txt index b6d17a44fd..ecccd49fe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -721,7 +721,6 @@ foreach(po_file ${BBL_L10N_PO_FILES}) add_custom_command( TARGET gettext_merge_po_with_pot PRE_BUILD COMMAND msgmerge -N -o ${po_file} ${po_file} "${BBL_L18N_DIR}/OrcaSlicer.pot" - DEPENDS ${po_file} ) endforeach() add_custom_target(gettext_po_to_mo @@ -737,7 +736,6 @@ foreach(po_file ${BBL_L10N_PO_FILES}) TARGET gettext_po_to_mo PRE_BUILD COMMAND msgfmt ARGS --check-format -o ${mo_file} ${po_file} #COMMAND msgfmt ARGS --check-compatibility -o ${mo_file} ${po_file} - DEPENDS ${po_file} ) endforeach() diff --git a/build_release_macos.sh b/build_release_macos.sh index 919bc1f7b2..2514bc5f66 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -181,9 +181,7 @@ function pack_deps() { function build_slicer() { echo "Generating config sources from proto..." - python3 -m venv /tmp/codegen_venv - /tmp/codegen_venv/bin/pip install grpcio-tools -q - /tmp/codegen_venv/bin/python tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; } + python3 tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; } # iterate over two architectures: x86_64 and arm64 for _ARCH in x86_64 arm64; do diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f7de86410d..6d039c0903 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -237,10 +237,6 @@ else () COMMAND ln -sf OrcaSlicer orca-slicer WORKING_DIRECTORY "$" VERBATIM) - else () - add_custom_command(TARGET OrcaSlicer POST_BUILD - WORKING_DIRECTORY "$" - VERBATIM) endif () if (XCODE) # Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index b05eee7957..5944a8912e 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.13) project(libslic3r_gui) include(PrecompiledHeader)