Fix SWIG build (#1159)

celeritas-project · Apr 2, 2024 · 3a31f2e · 3a31f2e
1 parent 6d3aada
commit 3a31f2e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
@@ -111,12 +111,9 @@ jobs:
         with:
           path: ${{env.CCACHE_DIR}}
           key: ccache-${{env.CMAKE_PRESET}}-${{matrix.geant}}-${{github.run_id}}
-          # NOTE: remove ccache-spack-clang-15* in follow-up PR
           restore-keys: |
             ccache-${{env.CMAKE_PRESET}}-${{matrix.geant}}
             ccache-${{env.CMAKE_PRESET}}
-            ccache-spack-clang-15-${{matrix.geant}}-
-            ccache-spack-clang-15-
       - name: Zero ccache stats
         run: |
           ccache -z

diff --git a/interface/celeritas.i b/interface/celeritas.i
@@ -45,6 +45,19 @@
   }
 }
 
+//---------------------------------------------------------------------------//
+// STD
+//---------------------------------------------------------------------------//
+
+namespace std
+{
+%ignore hash;
+template<class T>
+struct hash;
+};
+
+%ignore *::operator++;
+
 //---------------------------------------------------------------------------//
 // CORECEL
 //---------------------------------------------------------------------------//
@@ -57,6 +70,7 @@
 %ignore celeritas::Byte;
 %include "corecel/Macros.hh"
 %include "corecel/Types.hh"
+%import "corecel/OpaqueId.hh"
 
 %template(VecReal) std::vector<celeritas::real_type>;
 
@@ -65,15 +79,12 @@
 //---------------------------------------------------------------------------//
 
 %{
+#include "celeritas/Types.hh"
 #include "celeritas/Units.hh"
 #include "celeritas/Constants.hh"
 %}
 
-namespace celeritas
-{
-enum class UnitSystem;
-}
-
+%import "celeritas/Types.hh"
 %include "celeritas/Units.hh"
 %include "celeritas/Constants.hh"
 

diff --git a/scripts/cmake-presets/ci-ubuntu-github.json b/scripts/cmake-presets/ci-ubuntu-github.json
@@ -80,9 +80,10 @@
     },
     {
       "name": "reldeb-vecgeom",
-      "description": "Build with release, assertions, VecGeom",
+      "description": "Build with release, assertions, VecGeom, SWIG",
       "inherits": [".vecgeom", "spack"],
       "cacheVariables": {
+        "CELERITAS_USE_SWIG": {"type": "BOOL", "value": "ON"}
       }
     },
     {

diff --git a/src/celeritas/io/ImportOpticalMaterial.hh b/src/celeritas/io/ImportOpticalMaterial.hh
@@ -9,8 +9,6 @@
 
 #include <vector>
 
-#include "celeritas/phys/PDGNumber.hh"
-
 #include "ImportPhysicsVector.hh"
 #include "ImportUnits.hh"
 

diff --git a/src/celeritas/io/ImportPhysicsTable.hh b/src/celeritas/io/ImportPhysicsTable.hh
@@ -9,8 +9,6 @@
 
 #include <vector>
 
-#include "celeritas/Units.hh"
-
 #include "ImportPhysicsVector.hh"
 #include "ImportUnits.hh"