diff options
| author | Thomas White <taw@physics.org> | 2023-10-26 10:45:54 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2024-02-06 16:59:34 +0100 |
| commit | f9fe0992b4f03eec44b51274a179aee64f172e5a (patch) | |
| tree | 27281b1552627fec8e3861e516367e746e8ae69d | |
| parent | 87aa2caf1a226bfea9b6011412dd1a4e47330fa2 (diff) | |
Julia: Add .so suffix to libcrystfel
Something changed when I upgraded to Fedora 38, and now finding a
library from Julia in a system location (no absolute path), without the
suffix (see "dlext"), no longer works. "dlext" appears to work for an
absolute path, though. I don't know whether it's a Julia thing or an ld
thing.
| -rw-r--r-- | julia/CrystFEL/src/CrystFEL.jl | 2 | ||||
| -rw-r--r-- | julia/CrystFEL/src/datatemplates.jl | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/julia/CrystFEL/src/CrystFEL.jl b/julia/CrystFEL/src/CrystFEL.jl index 5afa9920..cdb99979 100644 --- a/julia/CrystFEL/src/CrystFEL.jl +++ b/julia/CrystFEL/src/CrystFEL.jl @@ -11,6 +11,8 @@ Julia bindings for CrystFEL data structures and routines """ module CrystFEL +libcrystfel = "libcrystfel.so" + include("detgeom.jl") using .DetGeoms export Panel, DetGeom diff --git a/julia/CrystFEL/src/datatemplates.jl b/julia/CrystFEL/src/datatemplates.jl index 00593286..1030e2ef 100644 --- a/julia/CrystFEL/src/datatemplates.jl +++ b/julia/CrystFEL/src/datatemplates.jl @@ -1,5 +1,6 @@ module DataTemplates +import ..CrystFEL: libcrystfel export DataTemplate, loaddatatemplate mutable struct InternalDataTemplate end @@ -10,7 +11,7 @@ end function loaddatatemplate(filename::AbstractString) - out = ccall((:data_template_new_from_file, :libcrystfel), + out = ccall((:data_template_new_from_file, libcrystfel), Ptr{InternalDataTemplate}, (Cstring,), filename) if out == C_NULL throw(OutOfMemoryError()) |