Skip to content

Commit

Permalink
Fix/use correct compiler pixi/conda (#914)
Browse files Browse the repository at this point in the history
* fix: Use the cxx-compiler package which will set the correct compiler for the platform, and setup the required environment for it to work as expected

* misc: update pixi versions in pipeline
  • Loading branch information
tony-p authored Jan 31, 2025
1 parent 48f6c5b commit b4bbef6
Show file tree
Hide file tree
Showing 4 changed files with 1,125 additions and 804 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pixi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
steps:
# Pixi is the tool used to create/manage conda environment
- uses: actions/checkout@v3
- uses: prefix-dev/setup-pixi@v0.4.1
- uses: prefix-dev/setup-pixi@v0.8.1
with:
pixi-version: v0.16.1
pixi-version: v0.40.3
- name: Build
run: pixi run build
- name: Run tests
Expand Down
2 changes: 0 additions & 2 deletions cmake/FindZeroMQ.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ else (ZeroMQ_LIBRARIES AND ZeroMQ_INCLUDE_DIRS)
find_path(ZeroMQ_INCLUDE_DIR
NAMES
zmq.h
HINTS
"$ENV{CONDA_PREFIX}/include"
PATHS
/usr/include
/usr/local/include
Expand Down
Loading

0 comments on commit b4bbef6

Please sign in to comment.