diff --git a/Project.toml b/Project.toml index f5f8ca2c2..80d8b3edf 100644 --- a/Project.toml +++ b/Project.toml @@ -31,9 +31,9 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192" [extensions] ExportVTKExt = "WriteVTK" -GLMakiePrecompilesExt = "GLMakie" +GLMakiePrecompilesExt = ["Makie", "GLMakie"] PlottingExt = "Makie" -WGLMakiePrecompilesExt = "WGLMakie" +WGLMakiePrecompilesExt = ["Makie", "WGLMakie"] [compat] Brillouin = "0.5.19" diff --git a/ext/GLMakiePrecompilesExt.jl b/ext/GLMakiePrecompilesExt.jl index 20766a240..e3be028a7 100644 --- a/ext/GLMakiePrecompilesExt.jl +++ b/ext/GLMakiePrecompilesExt.jl @@ -1,11 +1,11 @@ module GLMakiePrecompilesExt -import Sunny, GLMakie +import Sunny, Makie, GLMakie import PrecompileTools as PT -# Julia 1.11.1 caused a change in the ordering of precompilation for extensions. -# See https://github.com/JuliaLang/julia/issues/56204#issuecomment-2439588043 -@static if VERSION < v"1.11.1" +# Julia 1.11.1 broke extension precompiles, but this was fixed in 1.11.2. +# https://github.com/JuliaLang/julia/issues/56204#issuecomment-2439588043 +@static if VERSION != v"1.11.1" PT.@setup_workload begin PT.@compile_workload begin @@ -21,6 +21,6 @@ PT.@setup_workload begin end end -end # VERSION < v"1.11.1" +end end