cxxwrap: support version 0.14, keep support for 0.13

oscar-system · Sep 6, 2023 · 6efad08 · 6efad08
1 parent 0022db7
commit 6efad08
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Polymake"
 uuid = "d720cf60-89b5-51f5-aff5-213f193123e7"
 repo = "https://github.com/oscar-system/Polymake.jl.git"
-version = "0.11.4"
+version = "0.11.5"
 
 [deps]
 BinaryWrappers = "f01c122e-0ea1-4f85-ad8f-907073ad7a9f"
@@ -24,7 +24,7 @@ polymake_oscarnumber_jll = "10f31823-b687-53e6-9f29-edb9d4da9f9f"
 
 [compat]
 BinaryWrappers = "~0.1.0"
-CxxWrap = "~0.10.1, ~0.11, ~0.12, ~0.13.1"
+CxxWrap = "~0.10.1, ~0.11, ~0.12, ~0.13.1, ~0.14"
 JSON = "^0.20, ^0.21"
 Mongoc = "~0.6.0, ~0.7.0, ~0.8.0, ~0.9.0"
 Ninja_jll = "^1.11.1"

diff --git a/src/Polymake.jl b/src/Polymake.jl
@@ -96,8 +96,13 @@ module LibPolymake
   using polymake_jll
   using libpolymake_julia_jll
   using polymake_oscarnumber_jll
+  import ..Polymake: libcxxwrap_build_version
 
-  @wrapmodule(joinpath(libpolymake_julia), :define_module_polymake)
+  if libcxxwrap_build_version() >= v"0.11.0"
+    @wrapmodule(() -> joinpath(libpolymake_julia), :define_module_polymake)
+  else
+    @wrapmodule(joinpath(libpolymake_julia), :define_module_polymake)
+  end
 
   function __init__()
 
@@ -135,8 +140,13 @@ module LibOscarNumber
   using polymake_oscarnumber_jll
 
   import ..LibPolymake: show_small_obj
+  import ..Polymake: libcxxwrap_build_version
 
-  @wrapmodule(joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
+  if libcxxwrap_build_version() >= v"0.11.0"
+    @wrapmodule(() -> joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
+  else
+    @wrapmodule(joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
+  end
 
   function __init__()