Merge branch 'mac-release' of https://github.com/ochafik/openscad int…

…o python3-macos
openscad · Mar 21, 2023 · bf53ac6 · bf53ac6
2 parents c4de852 + e0d4a91
commit bf53ac6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -182,7 +182,7 @@ jobs:
           name: Install Homebrew packages
           command: |
             brew update
-            brew install automake libtool cmake pkg-config wget meson
+            brew install automake libtool cmake pkg-config wget meson python@3.11
       - restore_cache:
           keys:
             # CircleCI library caching. If we ever need invalidate the cache (e.g. to remove any old files 
@@ -214,6 +214,7 @@ jobs:
           name: Build OpenSCAD
           command: |
             export NUMCPU=$(($(sysctl -n hw.ncpu) * 3 / 2))
+            export PYTHON_EXECUTABLE=/opt/homebrew/bin/python3.11
             time ./scripts/release-common.sh snapshot
             cd build
             OPENSCAD_NAME=$(ls OpenSCAD-*.dmg)

diff --git a/scripts/release-common.sh b/scripts/release-common.sh
@@ -98,6 +98,9 @@ case $OS in
     MACOSX)
         . ./scripts/setenv-macos.sh
         CMAKE_CONFIG="$CMAKE_CONFIG -DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
+        if [[ -n "$PYTHON_EXECUTABLE" ]]; then
+          CMAKE_CONFIG="$CMAKE_CONFIG -DPYTHON_EXECUTABLE=$PYTHON_EXECUTABLE"
+        fi
     ;;
     LINUX)
         TARGET=