소스 검색

Auto-update pagmo to v2.19.0 (#3501)

* Update pagmo to v2.19.0

* update tbb version

---------

Co-authored-by: star9029 <[email protected]>
ruki 1 년 전
부모
커밋
e1cc464405
1개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8 5
      packages/p/pagmo/xmake.lua

+ 8 - 5
packages/p/pagmo/xmake.lua

@@ -1,11 +1,12 @@
 package("pagmo")
-
     set_homepage("https://esa.github.io/pagmo2/index.html")
     set_description("pagmo is a C++ scientific library for massively parallel optimization.")
     set_license("LGPL-3.0")
 
     add_urls("https://github.com/esa/pagmo2/archive/refs/tags/$(version).tar.gz",
              "https://github.com/esa/pagmo2.git")
+
+    add_versions("v2.19.0", "701ada528de7d454201e92a5d88903dd1c22ea64f43861d9694195ddfef82a70")
     add_versions("v2.18.0", "5ad40bf3aa91857a808d6b632d9e1020341a33f1a4115d7a2b78b78fd063ae31")
 
     local configdeps = {eigen = "EIGEN3", nlopt = "NLOPT", --[[ipopt = "IPOPT"]]}
@@ -13,9 +14,11 @@ package("pagmo")
         add_configs(config, {description = "Enable features against " .. config .. ".", default = true, type = "boolean"})
     end
 
-    add_deps("cmake", "tbb <2021.0")
+    add_deps("cmake")
+    add_deps("tbb")
     add_deps("boost", {configs = {serialization = true}})
-    on_load("windows", "macosx", "linux", function (package)
+
+    on_load(function (package)
         for config, dep in pairs(configdeps) do
             if package:config(config) then
                 package:add("deps", config)
@@ -23,9 +26,9 @@ package("pagmo")
         end
     end)
 
-    on_install("windows", "macosx", "linux", function (package)
+    on_install("windows", "macosx", "linux", "mingw@windows", "mingw@msys", function (package)
         local configs = {"-DCMAKE_INSTALL_LIBDIR=lib", "-DPAGMO_BUILD_TESTS=OFF", "-DBoost_USE_STATIC_LIBS=ON"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DPAGMO_BUILD_STATIC_LIBRARY=" .. (package:config("shared") and "OFF" or "ON"))
         for config, dep in pairs(configdeps) do
             table.insert(configs, "-DPAGMO_WITH_" .. dep .. "=" .. (package:config(config) and "ON" or "OFF"))