Skip to content

Commit a33f3e3

Browse files
committed
Use getfield to support older julia versions and apply the same approach to PATH_list and LIBPATH_list
1 parent e7308b1 commit a33f3e3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/wrapper_generators.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ macro generate_init_header(dependencies...)
3030
eager_mode = Expr[]
3131
if !isempty(dependencies)
3232
for dep in dependencies
33-
push!(deps_path_add, quote
34-
isdefined($(dep), :PATH_list) && append!(PATH_list, $(dep).PATH_list)
35-
isdefined($(dep), :LIBPATH_list) && append!(LIBPATH_list, $(dep).LIBPATH_list)
36-
end)
37-
depmod = getglobal(__module__, dep)
33+
depmod = getfield(__module__, dep)
34+
if isdefined(depmod, :PATH_list)
35+
push!(deps_path_add, :(append!(PATH_list, $(dep).PATH_list)))
36+
end
37+
if isdefined(depmod, :LIBPATH_list)
38+
push!(deps_path_add, :(append!(LIBPATH_list, $(dep).LIBPATH_list)))
39+
end
3840
if isdefined(depmod, :eager_mode)
3941
push!(eager_mode, :($(dep).eager_mode()))
4042
end

0 commit comments

Comments
 (0)