Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/c/cgal/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package("cgal")
set_license("LGPL-3.0")

add_urls("https://github.com/CGAL/cgal/releases/download/v$(version)/CGAL-$(version)-library.zip")
add_versions("6.1", "d129a47329e7811b31b7343901fdb7b64d029b0cce262405fbebacd11f9b00dd")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The addition of version 6.1 requires an update to the test configuration. CGAL versions 6.0 and newer require C++17, but the current logic on line 79 selects C++14 for this new version. This will likely cause the test to fail.

Please update the on_test block to select the correct C++ standard based on the version. For example:

on_test(function (package)
    local lang = "c++11"
    if package:version():ge("6.0") then
        lang = "c++17"
    elseif package:version():ge("5.0.0") then
        lang = "c++14"
    end
    assert(package:check_cxxsnippets({test = [[...]]}, {configs = {languages = lang}, includes = {"CGAL/Epick_d.h", "CGAL/Delaunay_triangulation.h"}}))
end)

add_versions("6.0.2", "5cda4d2490c9cc2cd8d7a4b87ca0ea2ef319724e728f761f55e09bc2394249b2")
add_versions("6.0", "f4a66cf4e276a377d263ee3db627919d1000e29bf24664a5d0b8cb82081ef706")
add_versions("5.6.1", "cf3900280d96847db8ac5e174d5e889f9764c7fa4e3d99f316f89910058335e6")
Expand Down
Loading