Upgrade version of CxxWrap

ianna · Dec 1, 2023 · 474cb16 · 474cb16
1 parent 8e500bb
commit 474cb16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -27,8 +27,8 @@ G4Vis = ["Makie", "Colors", "StaticArrays", "Rotations", "LinearAlgebra", "IGLWr
 
 [compat]
 CSV = "0.10"
-CxxWrap = "0.13"
-Geant4_julia_jll = "0.1.10"
+CxxWrap = "0.14"
+Geant4_julia_jll = "0.1.11"
 GeometryBasics = "0.4"
 IGLWrap_jll = "2.4.0"
 julia = "1.9"

diff --git a/gen/Geant4.wit.in b/gen/Geant4.wit.in
@@ -6,9 +6,9 @@ out_h_fname         = "cpp/jlGeant4.h"
 out_cxx_dir         = "cpp"
 out_jl_dir          = "jl"
 
-include_dirs        = [ "/usr/local/opt/llvm/include/c++/v1", 
-                        "/usr/local/opt/llvm@13/lib/clang/13.0.1/include", 
-                        "./cpp", 
+clang_opts          = ["-v"]
+
+include_dirs        = [ "./cpp", 
                         "@Geant4_INCLUDE_DIRS@",
                         "@XercesC_INCLUDE_DIR@",
                         "@Julia_INCLUDE_DIRS@",  

diff --git a/src/Geant4.jl b/src/Geant4.jl
@@ -7,11 +7,11 @@ module Geant4
     gendir = normpath(joinpath(@__DIR__, "../gen"))
     if isdir(joinpath(gendir, "build/lib"))
         include(joinpath(gendir, "jl/Geant4-export.jl"))
-        @wrapmodule(joinpath(gendir, "build/lib", "libGeant4Wrap.$(Libdl.dlext)"))
+        @wrapmodule(()->joinpath(gendir, "build/lib", "libGeant4Wrap.$(Libdl.dlext)"))
     else
         using Geant4_julia_jll
         include(Geant4_julia_jll.Geant4_exports)
-        @wrapmodule(Geant4_julia_jll.libGeant4Wrap)
+        @wrapmodule(()->Geant4_julia_jll.libGeant4Wrap)
     end
 
     function __init__()