#20 Find cppwg in pipx

Chaste · Nov 14, 2024 · 219e371 · 219e371
1 parent fa009a4
commit 219e371
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/test-cells-conda.yml b/.github/workflows/test-cells-conda.yml
@@ -39,8 +39,8 @@ jobs:
           use-mamba: true
           miniforge-version: latest
           python-version: ${{ matrix.python-version }}
-          channels: conda-forge
-          conda-remove-defaults: "true"
+          channels: conda-forge,defaults
+          conda-remove-defaults: "false"
 
       - name: Install cppwg
         run: |

diff --git a/examples/cells/CMakeLists.txt b/examples/cells/CMakeLists.txt
@@ -101,8 +101,9 @@ if(SKBUILD)
 endif()
 
 # Target for re-generating wrappers
+find_program(CPPWG cppwg)
 add_custom_target(pycells_wrappers
-    COMMAND ${Python3_EXECUTABLE} -m cppwg ${CMAKE_SOURCE_DIR}/src/cpp
+    COMMAND ${CPPWG} ${CMAKE_SOURCE_DIR}/src/cpp
             -w ${CMAKE_SOURCE_DIR}/dynamic/wrappers
             -p ${CMAKE_SOURCE_DIR}/dynamic/config.yaml
             -i "$<JOIN:$<TARGET_PROPERTY:_pycells_all,INCLUDE_DIRECTORIES>,;>"