Skip to content

Commit 886ad34

Browse files
committed
macos test
1 parent ef956b1 commit 886ad34

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/macOS_build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ jobs:
3838
run: brew install libomp
3939

4040
- name: Configure
41-
env:
42-
CC: gcc-12
43-
CXX: g++-12
4441
working-directory: build
4542
run: cmake ..
4643
-DCMAKE_BUILD_TYPE=Release

setup.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ def build_extension(self, ext):
4848
cmake_args = [
4949
f"-DPYTHON_EXECUTABLE={sys.executable}",
5050
"-DCMAKE_BUILD_TYPE=Release",
51-
"-DCMAKE_C_COMPILER=gcc",
52-
"-DCMAKE_CXX_COMPILER=g++",
5351
"-DXCSF_MAIN=OFF",
5452
"-DXCSF_PYLIB=ON",
5553
"-DENABLE_DOXYGEN=OFF",
@@ -59,9 +57,16 @@ def build_extension(self, ext):
5957
"--config",
6058
"Release",
6159
]
62-
if platform.system() == "Darwin": # set to force CI to use GCC
63-
cmake_args[2] = "-DCMAKE_C_COMPILER=gcc-12"
64-
cmake_args[3] = "-DCMAKE_CXX_COMPILER=g++-12"
60+
# if platform.system() == "Darwin": # set to force CI to use GCC
61+
# cmake_args[2] = "-DCMAKE_C_COMPILER=gcc-12"
62+
# cmake_args[3] = "-DCMAKE_CXX_COMPILER=g++-12"
63+
64+
if not platform.system() == "Darwin":
65+
cmake_args += [
66+
"-DCMAKE_C_COMPILER=gcc",
67+
"-DCMAKE_CXX_COMPILER=g++",
68+
]
69+
6570
if platform.system() == "Windows":
6671
cmake_args += ["-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=" + extdir]
6772
cmake_args += ["-GMinGW Makefiles"]

0 commit comments

Comments
 (0)