@@ -18,23 +18,19 @@ function cflags_validator(pkg_names...)
18
18
end
19
19
20
20
# Explicitly disallow global LCM installations
21
- validate_lcm (name, handle) = contains (name, dirname (@__FILE__ ))
21
+ validate_lcm (name, handle) = occursin ( dirname (@__FILE__ ), name )
22
22
23
23
@static if Sys. islinux ()
24
- deps = [
25
- python = library_dependency (" python" , aliases= [" libpython2.7.so" , " libpython3.2.so" , " libpython3.3.so" , " libpython3.4.so" , " libpython3.5.so" , " libpython3.6.so" , " libpython3.7.so" , " libpython3.8.so" ], validate= cflags_validator (" python" , " python2" , " python3" ))
26
- glib = library_dependency (" glib" , aliases= [" libglib-2.0-0" , " libglib-2.0" , " libglib-2.0.so.0" ], depends= [python], validate= cflags_validator (" glib-2.0" ))
27
- lcm = library_dependency (" lcm" , aliases= [" liblcm" , " liblcm.1" ], depends= [glib],
28
- validate= validate_lcm)
24
+ python = library_dependency (" python" , aliases= [" libpython2.7.so" , " libpython3.2.so" , " libpython3.3.so" , " libpython3.4.so" , " libpython3.5.so" , " libpython3.6.so" , " libpython3.7.so" , " libpython3.8.so" ], validate= cflags_validator (" python" , " python2" , " python3" ))
25
+ glib = library_dependency (" glib" , aliases= [" libglib-2.0-0" , " libglib-2.0" , " libglib-2.0.so.0" ], depends= [python], validate= cflags_validator (" glib-2.0" ))
26
+ lcm = library_dependency (" lcm" , aliases= [" liblcm" , " liblcm.1" ], depends= [glib],
27
+ validate= validate_lcm)
29
28
30
- provides (AptGet, Dict (" python-dev" => python, " libglib2.0-dev" => glib))
31
- ]
29
+ provides (AptGet, Dict (" python-dev" => python, " libglib2.0-dev" => glib))
32
30
else
33
- deps = [
34
- glib = library_dependency (" glib" , aliases = [" libglib-2.0-0" , " libglib-2.0" , " libglib-2.0.so.0" ])
35
- lcm = library_dependency (" lcm" , aliases= [" liblcm" , " liblcm.1" ], depends= [glib],
36
- validate= validate_lcm)
37
- ]
31
+ glib = library_dependency (" glib" , aliases = [" libglib-2.0-0" , " libglib-2.0" , " libglib-2.0.so.0" ])
32
+ lcm = library_dependency (" lcm" , aliases= [" liblcm" , " liblcm.1" ], depends= [glib],
33
+ validate= validate_lcm)
38
34
end
39
35
40
36
prefix = joinpath (BinDeps. depsdir (lcm), " usr" )
0 commit comments