Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] fix macos CI #107

Merged
merged 2 commits into from
Oct 28, 2024
Merged

[CI] fix macos CI #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aa3724
[macos] change pip to pipx
ThomasDuvinage Oct 28, 2024
ab31507
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ jobs:
apt: cython cython3 python-pytest python3-pytest python-numpy python3-numpy python-coverage python3-coverage python-setuptools python3-setuptools libeigen3-dev doxygen doxygen-latex libboost-all-dev libtinyxml2-dev libyaml-cpp-dev
macos: |
cask: gfortran
brew: eigen boost tinyxml2 yaml-cpp
pip: Cython coverage pytest numpy
brew: eigen boost tinyxml2 yaml-cpp pipx
pipx: Cython coverage pytest numpy
windows: |
pip: Cython coverage pytest numpy
github:
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ include(cmake/msvc-specific.cmake)

project(Tasks CXX)

if(UNIX AND NOT EMSCRIPTEN AND NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm"))
if(UNIX
AND NOT EMSCRIPTEN
AND NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
)
include(CheckCXXSourceCompiles)
check_cxx_compiler_flag("-msse2" SSE2_SUPPORTED)
if(SSE2_SUPPORTED)
Expand Down
Loading