Merge pull request #313 from jonathanBieler/link_cairo_fix

allow for direct call for link_cairo
GiovineItalia · Oct 16, 2018 · f37d1fe · f37d1fe
2 parents 71ffc8e + 5464bc5
commit f37d1fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Compose.jl b/src/Compose.jl
@@ -159,8 +159,8 @@ end
 
 function link_cairo()
     @info "Loading Cairo backend into Compose.jl"
-    include("cairo_backends.jl")
-    include("immerse_backend.jl")
+    include(joinpath(@__DIR__,"cairo_backends.jl"))
+    include(joinpath(@__DIR__,"immerse_backend.jl"))
 end
 
 function __init__()

diff --git a/src/cairo_backends.jl b/src/cairo_backends.jl
@@ -1,8 +1,5 @@
-for name in (:CairoContext, :CairoSurface, :CairoARGBSurface, :CairoEPSSurface,
-             :CairoPDFSurface, :CairoSVGSurface, :CairoImageSurface)
-    val = getfield(Cairo,name)
-    @eval const $name = $val
-end
+import Cairo: CairoContext, CairoSurface, CairoARGBSurface, CairoEPSSurface,
+CairoPDFSurface, CairoSVGSurface, CairoImageSurface
 
 abstract type ImageBackend end
 abstract type PNGBackend <: ImageBackend end