Skip to content

Commit 6432ce5

Browse files
committed
update
1 parent f6afb9c commit 6432ce5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

packages/o/openmvs/xmake.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ package("openmvs")
1717
add_configs("openmp", {description = "Enable OpenMP library", default = true, type = "boolean"})
1818
add_configs("python", {description = "Enable Python library bindings", default = false, type = "boolean"})
1919

20-
add_deps("cmake", "eigen <5.0", "glew", "opencv", "cgal", "vcglib", "zstd")
20+
add_deps("cmake", "cgal", "eigen <5.0", "glew", "opencv", "vcglib", "zstd")
2121
add_deps("boost", {configs = {iostreams = true, container = true, graph=true, program_options = true, serialization = true, thread = true, zlib = true, zstd = true}})
2222

23+
add_includedirs("include", "include/OpenMVS")
24+
add_linkdirs("lib/OpenMVS")
2325
on_load(function (package)
24-
package:add("defines", "BOOST_ALL_NO_LIB") -- disable boost auto-linking
25-
package:add("linkdirs", "lib/OpenMVS")
2626
if package:has_tool("cxx", "cl") then
2727
package:add("cxxflags", "/Zc:__cplusplus")
2828
end
@@ -33,7 +33,7 @@ package("openmvs")
3333
if package:config("python") then package:add("deps", "python") end
3434
end)
3535

36-
on_install("windows", "linux", "macosx", function (package)
36+
on_install("windows|!arm64", "linux", "macosx", function (package)
3737
io.replace("CMakeLists.txt", "# Project-wide settings", [[
3838
# Project-wide settings
3939
find_package(PkgConfig REQUIRED)
@@ -54,7 +54,7 @@ package("openmvs")
5454

5555
on_test(function (package)
5656
assert(package:check_cxxsnippets({test = [[
57-
#include <openMVS/MVS.h>
57+
#include "MVS.h"
5858
using namespace MVS;
5959
void test() {
6060
SEACAVE::cListTest<true>(100);
@@ -63,5 +63,5 @@ package("openmvs")
6363
SEACAVE::TestRayTriangleIntersection<float>(1000);
6464
SEACAVE::TestRayTriangleIntersection<double>(1000);
6565
}
66-
]]}, {configs = {languages = "c++11"}}))
66+
]]}, {configs = {languages = "c++14"}}))
6767
end)

0 commit comments

Comments
 (0)