Skip to content

Commit 991e2af

Browse files
committed
setup python sooner
1 parent 163b5b8 commit 991e2af

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/libzedmd-python-pybind11-extension.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,22 @@ jobs:
5858
- if: (matrix.platform == 'win')
5959
name: Add msbuild to path (win runner)
6060
uses: microsoft/setup-msbuild@v2
61-
- if: (matrix.platform == 'macos')
62-
name: Add autoconf and automake (mac runner)
63-
run: |
64-
brew install autoconf automake libtool
65-
6661
- if: (matrix.platform == 'macos')&&(matrix.arch == 'x64')
6762
name: Set up Python x64
6863
uses: actions/setup-python@v5
6964
with:
7065
architecture: 'x64'
7166
python-version: 3.11.9
67+
- if: (matrix.platform == 'macos')
68+
name: Add autoconf and automake (mac runner)
69+
run: |
70+
brew install autoconf automake libtool
71+
7272
- name: Display Python version
7373
run: python --version
74-
- name: Wich python
74+
- name: Which python
7575
run: which -a python
76+
7677
- name: Build libzedmd-${{ matrix.platform }}-${{ matrix.arch }}
7778
working-directory: extern/libzedmd/
7879
run: |

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ elseif(PLATFORM STREQUAL "macos")
3434
set(CMAKE_OSX_ARCHITECTURES arm64)
3535
elseif(ARCH STREQUAL "x64")
3636
set(CMAKE_OSX_ARCHITECTURES x86_64)
37-
set(PYTHON_VERSION " ")
37+
set(PYTHON_VERSION "")
3838
endif()
3939
# set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
4040
# set(CMAKE_INSTALL_RPATH "@executable_path")
@@ -56,7 +56,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 ")
5656

5757
# Python3 needed
5858

59-
find_package(Python3 ${PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
59+
find_package(Python3${PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
6060

6161
include_directories(
6262
${Python3_INCLUDE_DIRS}

0 commit comments

Comments
 (0)