Spaces:
Sleeping
Sleeping
7a5f89cb9d86f111296be289155f6f19e2dd3cadfaeba9249253eb234380f179
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/vcpkg.json +75 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentelemetry-cpp/portfile.cmake +58 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentelemetry-cpp/vcpkg.json +57 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/portfile.cmake +58 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/repair_mojibake.patch +59 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/0003-fix-cmake.patch +152 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/fix-Target-notfound.patch +19 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/portfile.cmake +67 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/vcpkg-cmake-wrapper.cmake.in +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/vcpkg.json +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/CMakeLists.txt +34 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/portfile.cmake +35 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/vcpkg.json +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvr/portfile.cmake +39 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvr/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/fix-jinja2.patch +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch +30 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/portfile.cmake +82 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/vcpkg.json +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optimus-cpp/portfile.cmake +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optimus-cpp/vcpkg.json +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-bare/portfile.cmake +29 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-bare/vcpkg.json +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-lite/portfile.cmake +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-lite/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opus/portfile.cmake +43 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opus/vcpkg.json +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/CMakeLists.txt +48 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/portfile.cmake +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/vcpkg.json +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch +162 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/0005-disable-tzdata.patch +30 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/portfile.cmake +64 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/usage +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/vcpkg.json +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/export-include-dir.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/portfile.cmake +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/vcpkg.json +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/collada.patch +126 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-curl.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-dependency-coin.patch +29 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-example-application.patch +34 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-liblas.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-nvtt.patch +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-sdl.patch +37 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/osgdb_zip_nozip.patch +52 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/vcpkg.json
ADDED
@@ -0,0 +1,75 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opensubdiv",
|
3 |
+
"version-semver": "3.4.3",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "An Open-Source subdivision surface library.",
|
6 |
+
"homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv",
|
7 |
+
"supports": "!arm & !uwp",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
}
|
13 |
+
],
|
14 |
+
"features": {
|
15 |
+
"cuda": {
|
16 |
+
"description": "Enable CUDA backend",
|
17 |
+
"dependencies": [
|
18 |
+
"cuda"
|
19 |
+
]
|
20 |
+
},
|
21 |
+
"dx": {
|
22 |
+
"description": "Enable DirectX support",
|
23 |
+
"dependencies": [
|
24 |
+
{
|
25 |
+
"name": "directxsdk",
|
26 |
+
"features": [
|
27 |
+
"xp"
|
28 |
+
]
|
29 |
+
}
|
30 |
+
]
|
31 |
+
},
|
32 |
+
"examples": {
|
33 |
+
"description": "Enable examples build"
|
34 |
+
},
|
35 |
+
"glew": {
|
36 |
+
"description": "Path to glew",
|
37 |
+
"dependencies": [
|
38 |
+
"glew"
|
39 |
+
]
|
40 |
+
},
|
41 |
+
"glfw": {
|
42 |
+
"description": "Path to glfw",
|
43 |
+
"dependencies": [
|
44 |
+
"glfw3"
|
45 |
+
]
|
46 |
+
},
|
47 |
+
"omp": {
|
48 |
+
"description": "Enable OpenMP backend"
|
49 |
+
},
|
50 |
+
"opencl": {
|
51 |
+
"description": "Enable OpenCL backend",
|
52 |
+
"dependencies": [
|
53 |
+
"opencl"
|
54 |
+
]
|
55 |
+
},
|
56 |
+
"ptex": {
|
57 |
+
"description": "Path to Ptex",
|
58 |
+
"dependencies": [
|
59 |
+
"ptex"
|
60 |
+
]
|
61 |
+
},
|
62 |
+
"tbb": {
|
63 |
+
"description": "Enable TBB backend",
|
64 |
+
"dependencies": [
|
65 |
+
"tbb"
|
66 |
+
]
|
67 |
+
},
|
68 |
+
"true-deriv-eval": {
|
69 |
+
"description": "Enable true derivative evaluation for Gregory basis patches"
|
70 |
+
},
|
71 |
+
"tutorials": {
|
72 |
+
"description": "Enable tutorials build"
|
73 |
+
}
|
74 |
+
}
|
75 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentelemetry-cpp/portfile.cmake
ADDED
@@ -0,0 +1,58 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
2 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
3 |
+
endif()
|
4 |
+
|
5 |
+
if ("etw" IN_LIST FEATURES)
|
6 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX")
|
7 |
+
message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'")
|
8 |
+
endif()
|
9 |
+
endif()
|
10 |
+
|
11 |
+
vcpkg_from_github(
|
12 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
13 |
+
REPO open-telemetry/opentelemetry-cpp
|
14 |
+
REF v1.2.0
|
15 |
+
SHA512 5491fc21074f86d3b4ad5e8f7b16168b736491952942b7821984c4564fcb26f73630d83fe74ee7878848240a1b511f893e079154f42013bfe3bf1fd03c114c6d
|
16 |
+
HEAD_REF main
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
20 |
+
FEATURES
|
21 |
+
etw WITH_ETW
|
22 |
+
zipkin WITH_ZIPKIN
|
23 |
+
prometheus WITH_PROMETHEUS
|
24 |
+
elasticsearch WITH_ELASTICSEARCH
|
25 |
+
jaeger WITH_JAEGER
|
26 |
+
otlp WITH_OTLP
|
27 |
+
zpages WITH_ZPAGES
|
28 |
+
)
|
29 |
+
|
30 |
+
# opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it.
|
31 |
+
if(WITH_OTLP)
|
32 |
+
set(OTEL_PROTO_VERSION "0.11.0")
|
33 |
+
vcpkg_download_distfile(ARCHIVE
|
34 |
+
URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz"
|
35 |
+
FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz"
|
36 |
+
SHA512 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92
|
37 |
+
)
|
38 |
+
|
39 |
+
vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party)
|
40 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto)
|
41 |
+
file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto)
|
42 |
+
endif()
|
43 |
+
|
44 |
+
vcpkg_cmake_configure(
|
45 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
46 |
+
OPTIONS
|
47 |
+
-DBUILD_TESTING=OFF
|
48 |
+
-DWITH_EXAMPLES=OFF
|
49 |
+
${FEATURE_OPTIONS}
|
50 |
+
)
|
51 |
+
|
52 |
+
vcpkg_cmake_install()
|
53 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
54 |
+
vcpkg_copy_pdbs()
|
55 |
+
|
56 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
57 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
58 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentelemetry-cpp/vcpkg.json
ADDED
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
|
3 |
+
"name": "opentelemetry-cpp",
|
4 |
+
"version-semver": "1.2.0",
|
5 |
+
"description": [
|
6 |
+
"OpenTelemetry is a collection of tools, APIs, and SDKs.",
|
7 |
+
"You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior."
|
8 |
+
],
|
9 |
+
"homepage": "https://github.com/open-telemetry/opentelemetry-cpp",
|
10 |
+
"license": "Apache-2.0",
|
11 |
+
"supports": "!(windows & !static)",
|
12 |
+
"dependencies": [
|
13 |
+
"curl",
|
14 |
+
"nlohmann-json",
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake-config",
|
21 |
+
"host": true
|
22 |
+
}
|
23 |
+
],
|
24 |
+
"features": {
|
25 |
+
"elasticsearch": {
|
26 |
+
"description": "Whether to include the Elasticsearch Client in the SDK"
|
27 |
+
},
|
28 |
+
"etw": {
|
29 |
+
"description": "Whether to include the ETW Exporter in the SDK"
|
30 |
+
},
|
31 |
+
"jaeger": {
|
32 |
+
"description": "Whether to include the Jaeger exporter",
|
33 |
+
"dependencies": [
|
34 |
+
"thrift"
|
35 |
+
]
|
36 |
+
},
|
37 |
+
"otlp": {
|
38 |
+
"description": "Whether to include the OpenTelemetry Protocol in the SDK",
|
39 |
+
"dependencies": [
|
40 |
+
"grpc",
|
41 |
+
"protobuf"
|
42 |
+
]
|
43 |
+
},
|
44 |
+
"prometheus": {
|
45 |
+
"description": "Whether to include the Prometheus Client in the SDK",
|
46 |
+
"dependencies": [
|
47 |
+
"prometheus-cpp"
|
48 |
+
]
|
49 |
+
},
|
50 |
+
"zipkin": {
|
51 |
+
"description": "Whether to include the Zipkin exporter in the SDK"
|
52 |
+
},
|
53 |
+
"zpages": {
|
54 |
+
"description": "Whether to include the Zpages Server in the SDK"
|
55 |
+
}
|
56 |
+
}
|
57 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/portfile.cmake
ADDED
@@ -0,0 +1,58 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
2 |
+
set(LOCAL_OPTIONS
|
3 |
+
-DBUILD_STATIC_LIBS=OFF
|
4 |
+
)
|
5 |
+
else()
|
6 |
+
message("Static building is only possible when compiling static and dynamic versions at the same time. Enabling both.")
|
7 |
+
set(VCPKG_LIBRARY_LINKAGE dynamic)
|
8 |
+
endif()
|
9 |
+
|
10 |
+
vcpkg_from_github(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
REPO opentracing/opentracing-cpp
|
13 |
+
REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0
|
14 |
+
SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e
|
15 |
+
PATCHES
|
16 |
+
repair_mojibake.patch
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_configure_cmake(
|
20 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
21 |
+
PREFER_NINJA
|
22 |
+
OPTIONS
|
23 |
+
-DENABLE_LINTING=OFF
|
24 |
+
${LOCAL_OPTIONS}
|
25 |
+
)
|
26 |
+
|
27 |
+
vcpkg_install_cmake()
|
28 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenTracing)
|
29 |
+
|
30 |
+
vcpkg_copy_pdbs()
|
31 |
+
|
32 |
+
# Move DLLs to /bin
|
33 |
+
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
|
34 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
35 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
|
36 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/bin/opentracing.dll)
|
37 |
+
|
38 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
|
39 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/debug/bin/opentracing.dll)
|
40 |
+
|
41 |
+
# Fix targets
|
42 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake RELEASE_CONFIG)
|
43 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/opentracing.dll"
|
44 |
+
"\${_IMPORT_PREFIX}/bin/opentracing.dll" RELEASE_CONFIG ${RELEASE_CONFIG})
|
45 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake "${RELEASE_CONFIG}")
|
46 |
+
|
47 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake DEBUG_CONFIG)
|
48 |
+
string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/opentracing.dll"
|
49 |
+
"\${_IMPORT_PREFIX}/debug/bin/opentracing.dll" DEBUG_CONFIG ${DEBUG_CONFIG})
|
50 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake "${DEBUG_CONFIG}")
|
51 |
+
endif()
|
52 |
+
endif()
|
53 |
+
|
54 |
+
# Handle copyright
|
55 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
56 |
+
|
57 |
+
# Remove duplicate headers
|
58 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/repair_mojibake.patch
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001
|
2 |
+
From: Billy Robert O'Neal III <[email protected]>
|
3 |
+
Date: Fri, 18 Dec 2020 10:07:02 -0800
|
4 |
+
Subject: [PATCH] Repair mojibake in expected.hpp
|
5 |
+
|
6 |
+
The affected characters herein triggered warnings
|
7 |
+
C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001).
|
8 |
+
---
|
9 |
+
3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------
|
10 |
+
1 file changed, 6 insertions(+), 6 deletions(-)
|
11 |
+
|
12 |
+
diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp
|
13 |
+
index 8283a77..0d21d43 100644
|
14 |
+
--- a/3rd_party/include/opentracing/expected/expected.hpp
|
15 |
+
+++ b/3rd_party/include/opentracing/expected/expected.hpp
|
16 |
+
@@ -778,13 +778,13 @@ class expected
|
17 |
+
// expected<decltype(func(declval<T>())),E> map(F&& func) ;
|
18 |
+
|
19 |
+
// template <typename F>
|
20 |
+
-// �see below� bind(F&& func);
|
21 |
+
+// 'see below' bind(F&& func);
|
22 |
+
|
23 |
+
// template <typename F>
|
24 |
+
// expected<T,E> catch_error(F&& f);
|
25 |
+
|
26 |
+
// template <typename F>
|
27 |
+
-// �see below� then(F&& func);
|
28 |
+
+// 'see below' then(F&& func);
|
29 |
+
|
30 |
+
private:
|
31 |
+
bool has_value_;
|
32 |
+
@@ -955,9 +955,9 @@ class expected<void, E>
|
33 |
+
return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value;
|
34 |
+
}
|
35 |
+
|
36 |
+
-// template constexpr �see below� unwrap() const&;
|
37 |
+
+// template constexpr 'see below' unwrap() const&;
|
38 |
+
//
|
39 |
+
-// template �see below� unwrap() &&;
|
40 |
+
+// template 'see below' unwrap() &&;
|
41 |
+
|
42 |
+
// factories
|
43 |
+
|
44 |
+
@@ -968,13 +968,13 @@ class expected<void, E>
|
45 |
+
// expected<decltype(func()), E> map(F&& func) ;
|
46 |
+
//
|
47 |
+
// template <typename F>
|
48 |
+
-// �see below� bind(F&& func) ;
|
49 |
+
+// 'see below' bind(F&& func) ;
|
50 |
+
//
|
51 |
+
// template <typename F>
|
52 |
+
// expected<void,E> catch_error(F&& f);
|
53 |
+
//
|
54 |
+
// template <typename F>
|
55 |
+
-// �see below� then(F&& func);
|
56 |
+
+// 'see below' then(F&& func);
|
57 |
+
|
58 |
+
private:
|
59 |
+
bool has_value_;
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opentracing/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opentracing",
|
3 |
+
"version": "1.6.0",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "C++ implementation of the OpenTracing API",
|
6 |
+
"homepage": "https://opentracing.io",
|
7 |
+
"supports": "!uwp"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/0003-fix-cmake.patch
ADDED
@@ -0,0 +1,152 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 8dfbc5e..0ba8887 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -373,13 +373,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
6 |
+
|
7 |
+
if(OPENVDB_INSTALL_CMAKE_MODULES)
|
8 |
+
set(OPENVDB_CMAKE_MODULES
|
9 |
+
- cmake/FindBlosc.cmake
|
10 |
+
cmake/FindJemalloc.cmake
|
11 |
+
- cmake/FindIlmBase.cmake
|
12 |
+
cmake/FindLog4cplus.cmake
|
13 |
+
- cmake/FindOpenEXR.cmake
|
14 |
+
cmake/FindOpenVDB.cmake
|
15 |
+
- cmake/FindTBB.cmake
|
16 |
+
cmake/OpenVDBGLFW3Setup.cmake
|
17 |
+
cmake/OpenVDBHoudiniSetup.cmake
|
18 |
+
cmake/OpenVDBMayaSetup.cmake
|
19 |
+
diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
|
20 |
+
index 0dac1de..5014c6a 100644
|
21 |
+
--- a/cmake/FindOpenVDB.cmake
|
22 |
+
+++ b/cmake/FindOpenVDB.cmake
|
23 |
+
@@ -485,7 +485,7 @@ endif()
|
24 |
+
|
25 |
+
# Add standard dependencies
|
26 |
+
|
27 |
+
-find_package(TBB REQUIRED COMPONENTS tbb)
|
28 |
+
+find_package(TBB CONFIG REQUIRED)
|
29 |
+
|
30 |
+
if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
|
31 |
+
# @note Both of these must be set for Boost 1.70 (VFX2020) to link against
|
32 |
+
@@ -635,7 +635,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
|
33 |
+
endif()
|
34 |
+
|
35 |
+
if(OpenVDB_USES_BLOSC)
|
36 |
+
- find_package(Blosc REQUIRED)
|
37 |
+
+ find_package(blosc CONFIG REQUIRED)
|
38 |
+
endif()
|
39 |
+
|
40 |
+
if(OpenVDB_USES_ZLIB)
|
41 |
+
@@ -649,7 +649,7 @@ endif()
|
42 |
+
if(OpenVDB_USES_IMATH_HALF)
|
43 |
+
find_package(Imath CONFIG)
|
44 |
+
if (NOT TARGET Imath::Imath)
|
45 |
+
- find_package(IlmBase REQUIRED COMPONENTS Half)
|
46 |
+
+ find_package(IlmBase CONFIG REQUIRED)
|
47 |
+
endif()
|
48 |
+
|
49 |
+
if(WIN32)
|
50 |
+
@@ -698,7 +698,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
|
51 |
+
|
52 |
+
if(NOT OPENVDB_USE_STATIC_LIBS)
|
53 |
+
if(OpenVDB_USES_BLOSC)
|
54 |
+
- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc)
|
55 |
+
+ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc)
|
56 |
+
endif()
|
57 |
+
if(OpenVDB_USES_ZLIB)
|
58 |
+
list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
|
59 |
+
diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
|
60 |
+
index 1d5b75f..f2da6f9 100644
|
61 |
+
--- a/openvdb/openvdb/CMakeLists.txt
|
62 |
+
+++ b/openvdb/openvdb/CMakeLists.txt
|
63 |
+
@@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
|
64 |
+
endif()
|
65 |
+
endif()
|
66 |
+
|
67 |
+
-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
|
68 |
+
+find_package(TBB CONFIG REQUIRED)
|
69 |
+
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
|
70 |
+
- if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
|
71 |
+
+ if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
|
72 |
+
message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
|
73 |
+
"is deprecated and will be removed.")
|
74 |
+
endif()
|
75 |
+
@@ -138,7 +138,7 @@ endif()
|
76 |
+
if(USE_IMATH_HALF)
|
77 |
+
find_package(Imath CONFIG)
|
78 |
+
if (NOT TARGET Imath::Imath)
|
79 |
+
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
|
80 |
+
+ find_package(IlmBase CONFIG REQUIRED)
|
81 |
+
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
|
82 |
+
if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
|
83 |
+
message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
|
84 |
+
@@ -157,26 +157,7 @@ endif()
|
85 |
+
|
86 |
+
if(USE_BLOSC)
|
87 |
+
# Find Blosc libraries
|
88 |
+
- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED)
|
89 |
+
- if(Blosc_VERSION)
|
90 |
+
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION)
|
91 |
+
- if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION)
|
92 |
+
- message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} "
|
93 |
+
- "is deprecated and will be removed.")
|
94 |
+
- endif()
|
95 |
+
- endif()
|
96 |
+
- # Print a warning if using of the blosc versions with regression issues
|
97 |
+
- # with Blosc 1.5.0 caches.
|
98 |
+
- if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND
|
99 |
+
- Blosc_VERSION VERSION_LESS 1.14.0) OR
|
100 |
+
- (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND
|
101 |
+
- Blosc_VERSION VERSION_LESS 1.16.2))
|
102 |
+
- message(WARNING "The following Blosc versions are incompatible with the "
|
103 |
+
- "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. "
|
104 |
+
- "Found Blosc version '${Blosc_VERSION}' which falls in this range. We "
|
105 |
+
- "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'")
|
106 |
+
- endif()
|
107 |
+
- endif()
|
108 |
+
+ find_package(blosc CONFIG REQUIRED)
|
109 |
+
else()
|
110 |
+
message(WARNING "Blosc support is disabled. It is strongly recommended to "
|
111 |
+
"enable blosc for optimal builds of OpenVDB and to support compatible "
|
112 |
+
@@ -234,7 +215,7 @@ endif()
|
113 |
+
# /usr/local
|
114 |
+
|
115 |
+
if(USE_BLOSC)
|
116 |
+
- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
|
117 |
+
+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc)
|
118 |
+
endif()
|
119 |
+
|
120 |
+
if(USE_BLOSC OR USE_ZLIB)
|
121 |
+
diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt
|
122 |
+
index c1d5649..c173566 100644
|
123 |
+
--- a/openvdb/openvdb/cmd/CMakeLists.txt
|
124 |
+
+++ b/openvdb/openvdb/cmd/CMakeLists.txt
|
125 |
+
@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
|
126 |
+
find_package(Jemalloc REQUIRED)
|
127 |
+
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc)
|
128 |
+
elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
|
129 |
+
- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc)
|
130 |
+
+ find_package(TBB CONFIG REQUIRED)
|
131 |
+
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
|
132 |
+
endif()
|
133 |
+
|
134 |
+
@@ -90,17 +90,13 @@ if(OPENVDB_BUILD_VDB_RENDER)
|
135 |
+
find_package(Imath CONFIG)
|
136 |
+
if (NOT TARGET Imath::Imath)
|
137 |
+
if(USE_EXR)
|
138 |
+
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
|
139 |
+
- else()
|
140 |
+
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
|
141 |
+
+ find_package(IlmBase CONFIG REQUIRED)
|
142 |
+
endif()
|
143 |
+
endif()
|
144 |
+
endif()
|
145 |
+
|
146 |
+
if(USE_EXR)
|
147 |
+
if (NOT TARGET Imath::Imath)
|
148 |
+
- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
|
149 |
+
- else()
|
150 |
+
find_package(OpenEXR CONFIG REQUIRED)
|
151 |
+
endif()
|
152 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/fix-Target-notfound.patch
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt
|
2 |
+
index c173566..53f8575 100644
|
3 |
+
--- a/openvdb/openvdb/cmd/CMakeLists.txt
|
4 |
+
+++ b/openvdb/openvdb/cmd/CMakeLists.txt
|
5 |
+
@@ -137,9 +137,11 @@ if(OPENVDB_BUILD_VDB_RENDER)
|
6 |
+
|
7 |
+
if(WIN32)
|
8 |
+
# @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed
|
9 |
+
- get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE)
|
10 |
+
- if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY))
|
11 |
+
- target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB)
|
12 |
+
+ if(USE_IMATH_HALF)
|
13 |
+
+ get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE)
|
14 |
+
+ if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY))
|
15 |
+
+ target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB)
|
16 |
+
+ endif()
|
17 |
+
endif()
|
18 |
+
endif()
|
19 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/portfile.cmake
ADDED
@@ -0,0 +1,67 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO AcademySoftwareFoundation/openvdb
|
4 |
+
REF 0ed0f19ea4fbb0d8bf64d3dca07abab3c7429803 # v9.0.0
|
5 |
+
SHA512 f033f2d5801327ab8aeffb12d1a74ff880e477a1f00da3b03a3087262a3e72ef77c13e05fe8e3c94a26721804230c0272d9ca069af997c36c992f3e2f3d962f2
|
6 |
+
PATCHES
|
7 |
+
0003-fix-cmake.patch
|
8 |
+
fix-Target-notfound.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake")
|
12 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindIlmBase.cmake")
|
13 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindBlosc.cmake")
|
14 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindOpenEXR.cmake")
|
15 |
+
|
16 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OPENVDB_STATIC)
|
17 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" OPENVDB_SHARED)
|
18 |
+
|
19 |
+
set(OPENVDB_BUILD_TOOLS OFF)
|
20 |
+
if ("tools" IN_LIST FEATURES)
|
21 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
22 |
+
set(OPENVDB_BUILD_TOOLS ON)
|
23 |
+
else()
|
24 |
+
message(FATAL_ERROR "Unable to build tools if static libraries are required")
|
25 |
+
endif()
|
26 |
+
endif()
|
27 |
+
|
28 |
+
if ("ax" IN_LIST FEATURES)
|
29 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
30 |
+
set(OPENVDB_BUILD_AX ON)
|
31 |
+
else()
|
32 |
+
message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.")
|
33 |
+
endif()
|
34 |
+
endif()
|
35 |
+
|
36 |
+
vcpkg_cmake_configure(
|
37 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
38 |
+
OPTIONS
|
39 |
+
-DOPENVDB_BUILD_UNITTESTS=OFF
|
40 |
+
-DOPENVDB_BUILD_PYTHON_MODULE=OFF
|
41 |
+
-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
|
42 |
+
-DUSE_GLFW3=ON
|
43 |
+
-DOPENVDB_CORE_STATIC=${OPENVDB_STATIC}
|
44 |
+
-DOPENVDB_CORE_SHARED=${OPENVDB_SHARED}
|
45 |
+
-DOPENVDB_BUILD_VDB_PRINT=${OPENVDB_BUILD_TOOLS}
|
46 |
+
-DOPENVDB_BUILD_VDB_VIEW=${OPENVDB_BUILD_TOOLS}
|
47 |
+
-DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS}
|
48 |
+
-DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS}
|
49 |
+
-DUSE_PKGCONFIG=OFF
|
50 |
+
${OPENVDB_BUILD_AX}
|
51 |
+
)
|
52 |
+
|
53 |
+
vcpkg_cmake_install()
|
54 |
+
|
55 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB)
|
56 |
+
|
57 |
+
vcpkg_copy_pdbs()
|
58 |
+
|
59 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
60 |
+
|
61 |
+
if (OPENVDB_BUILD_TOOLS)
|
62 |
+
vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN)
|
63 |
+
endif()
|
64 |
+
|
65 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
66 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
67 |
+
file(INSTALL "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package openvdb provides CMake targets:
|
2 |
+
|
3 |
+
find_package(OpenVDB CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE OpenVDB::openvdb)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/vcpkg-cmake-wrapper.cmake.in
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(OPENVDB_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
|
2 |
+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
3 |
+
|
4 |
+
list(REMOVE_ITEM ARGS "NO_MODULE")
|
5 |
+
list(REMOVE_ITEM ARGS "CONFIG")
|
6 |
+
list(REMOVE_ITEM ARGS "MODULE")
|
7 |
+
|
8 |
+
set(OPENVDB_USE_STATIC_LIBS @OPENVDB_STATIC@)
|
9 |
+
|
10 |
+
_find_package(${ARGS})
|
11 |
+
|
12 |
+
set(CMAKE_MODULE_PATH ${OPENVDB_PREV_MODULE_PATH})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvdb/vcpkg.json
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openvdb",
|
3 |
+
"version": "9.0.0",
|
4 |
+
"description": "Sparse volume data structure and tools",
|
5 |
+
"homepage": "https://github.com/dreamworksanimation/openvdb",
|
6 |
+
"license": "MPL-2.0",
|
7 |
+
"dependencies": [
|
8 |
+
"blosc",
|
9 |
+
"boost-any",
|
10 |
+
"boost-date-time",
|
11 |
+
"boost-interprocess",
|
12 |
+
"boost-iostreams",
|
13 |
+
"boost-ptr-container",
|
14 |
+
"boost-system",
|
15 |
+
"boost-thread",
|
16 |
+
"boost-uuid",
|
17 |
+
"ilmbase",
|
18 |
+
"openexr",
|
19 |
+
"tbb",
|
20 |
+
{
|
21 |
+
"name": "vcpkg-cmake",
|
22 |
+
"host": true
|
23 |
+
},
|
24 |
+
{
|
25 |
+
"name": "vcpkg-cmake-config",
|
26 |
+
"host": true
|
27 |
+
}
|
28 |
+
],
|
29 |
+
"features": {
|
30 |
+
"ax": {
|
31 |
+
"description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data."
|
32 |
+
},
|
33 |
+
"tools": {
|
34 |
+
"description": "OpenVDB utilities: view, print and render",
|
35 |
+
"dependencies": [
|
36 |
+
"glew",
|
37 |
+
"glfw3"
|
38 |
+
]
|
39 |
+
}
|
40 |
+
}
|
41 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/CMakeLists.txt
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.5)
|
2 |
+
project(openvpncli CXX)
|
3 |
+
|
4 |
+
find_path(ASIO_HPP asio.hpp)
|
5 |
+
find_library(MBEDTLS_LIB mbedtls)
|
6 |
+
find_library(MBEDCRYPTO_LIB mbedcrypto)
|
7 |
+
find_library(MBEDX509_LIB mbedx509)
|
8 |
+
|
9 |
+
include_directories(. ${ASIO_HPP})
|
10 |
+
|
11 |
+
if(WIN32)
|
12 |
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
|
13 |
+
endif()
|
14 |
+
|
15 |
+
add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS -D_WIN32_WINNT=0x0600)
|
16 |
+
if(LINUX)
|
17 |
+
add_compile_options(-include bits/endian.h)
|
18 |
+
endif()
|
19 |
+
|
20 |
+
add_library(ovpncli client/ovpncli.cpp)
|
21 |
+
target_link_libraries(ovpncli PRIVATE Iphlpapi.lib Wininet.lib Setupapi.lib Cfgmgr32.lib Rpcrt4.lib Fwpuclnt.lib Wtsapi32.lib ${MBEDTLS_LIB} ${MBEDCRYPTO_LIB} ${MBEDX509_LIB})
|
22 |
+
|
23 |
+
install(
|
24 |
+
TARGETS ovpncli
|
25 |
+
RUNTIME DESTINATION bin
|
26 |
+
LIBRARY DESTINATION lib
|
27 |
+
ARCHIVE DESTINATION lib
|
28 |
+
)
|
29 |
+
|
30 |
+
if(BUILD_TOOL)
|
31 |
+
add_executable(cli test/ovpncli/cli.cpp)
|
32 |
+
target_compile_definitions(cli PRIVATE -DTAP_WIN_COMPONENT_ID=tap0901)
|
33 |
+
target_link_libraries(cli PRIVATE ovpncli)
|
34 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/portfile.cmake
ADDED
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(VCPKG_LIBRARY_LINKAGE static)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO OpenVPN/openvpn3
|
6 |
+
REF release/3.4.1
|
7 |
+
SHA512 2d0a7d2d48047c969ba1cb49b34d51c85dd82ae97296d7c096ead13a8e7cc69fa3908262228e29d93f60b7273814d8ef5a402a5d401cd7f91370868d5d308678
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
12 |
+
|
13 |
+
vcpkg_configure_cmake(
|
14 |
+
SOURCE_PATH ${SOURCE_PATH}
|
15 |
+
PREFER_NINJA
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_install_cmake()
|
19 |
+
|
20 |
+
file(COPY ${SOURCE_PATH}/openvpn DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
|
21 |
+
file(COPY ${SOURCE_PATH}/client/ovpncli.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/openvpn/)
|
22 |
+
|
23 |
+
file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/openvpn/*)
|
24 |
+
foreach(HEADER IN LISTS HEADERS)
|
25 |
+
file(READ "${HEADER}" _contents)
|
26 |
+
string(REPLACE "defined(USE_ASIO)" "1" _contents "${_contents}")
|
27 |
+
string(REPLACE "#ifdef USE_ASIO\n" "#if 1\n" _contents "${_contents}")
|
28 |
+
string(REPLACE "defined(USE_MBEDTLS)" "1" _contents "${_contents}")
|
29 |
+
string(REPLACE "#ifdef USE_MBEDTLS\n" "#if 1\n" _contents "${_contents}")
|
30 |
+
file(WRITE "${HEADER}" "${_contents}")
|
31 |
+
endforeach()
|
32 |
+
|
33 |
+
file(INSTALL
|
34 |
+
${SOURCE_PATH}/COPYRIGHT.AGPLV3
|
35 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/share/openvpn3 RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvpn3/vcpkg.json
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openvpn3",
|
3 |
+
"version-string": "3.4.1",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.",
|
6 |
+
"dependencies": [
|
7 |
+
"asio",
|
8 |
+
"mbedtls",
|
9 |
+
{
|
10 |
+
"name": "tap-windows6",
|
11 |
+
"platform": "windows"
|
12 |
+
}
|
13 |
+
]
|
14 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvr/portfile.cmake
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO ValveSoftware/openvr
|
6 |
+
REF 4c85abcb7f7f1f02adaf3812018c99fc593bc341 # v1.16.8
|
7 |
+
SHA512 366e553e6c9caa2bf884caf41b29a7ae6bdad165aeb56ea469625dc963bd91fd8423e753d07a28f8b6a69eed3939ba5a5e4fb0f84b52074bf6279b510e66f793
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
12 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
13 |
+
set(ARCH_PATH "win64")
|
14 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
15 |
+
set(ARCH_PATH "win32")
|
16 |
+
else()
|
17 |
+
message(FATAL_ERROR "Package only supports x64 and x86 Windows.")
|
18 |
+
endif()
|
19 |
+
elseif(VCPKG_TARGET_IS_LINUX)
|
20 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
21 |
+
set(ARCH_PATH "linux64")
|
22 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
23 |
+
set(ARCH_PATH "linux32")
|
24 |
+
else()
|
25 |
+
message(FATAL_ERROR "Package only supports x64 and x86 Linux.")
|
26 |
+
endif()
|
27 |
+
else()
|
28 |
+
message(FATAL_ERROR "Package only supports Windows and Linux.")
|
29 |
+
endif()
|
30 |
+
|
31 |
+
file(COPY ${SOURCE_PATH}/lib/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
32 |
+
file(COPY ${SOURCE_PATH}/lib/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
33 |
+
|
34 |
+
file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
|
35 |
+
file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
|
36 |
+
|
37 |
+
file(INSTALL ${SOURCE_PATH}/headers DESTINATION ${CURRENT_PACKAGES_DIR} RENAME include)
|
38 |
+
|
39 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openvr/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openvr",
|
3 |
+
"version": "1.16.8",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.",
|
6 |
+
"homepage": "https://github.com/ValveSoftware/openvr",
|
7 |
+
"supports": "!(arm | uwp | osx | android)"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/002-fix-hpp-gen.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py
|
2 |
+
index 6b95fe4..3a19058 100755
|
3 |
+
--- a/scripts/hpp_genxr.py
|
4 |
+
+++ b/scripts/hpp_genxr.py
|
5 |
+
@@ -80,6 +80,11 @@ def genTarget(args):
|
6 |
+
"XR_MSFT_controller_model",
|
7 |
+
# Projection of static string fails
|
8 |
+
"XR_MSFT_spatial_graph_bridge",
|
9 |
+
+ "XR_MSFT_spatial_anchor_persistence",
|
10 |
+
+ "XR_MSFT_holographic_window_attachment",
|
11 |
+
+ # Projection of UuidMSFT fails
|
12 |
+
+ "XR_MSFT_scene_understanding",
|
13 |
+
+ "XR_MSFT_scene_understanding_serialization",
|
14 |
+
))
|
15 |
+
|
16 |
+
# Turn lists of names/patterns into matching regular expressions
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/fix-jinja2.patch
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From d80c7dc3f4810fc49e4444590d39ef71e8a9b01c Mon Sep 17 00:00:00 2001
|
2 |
+
From: Adam Johnson <[email protected]>
|
3 |
+
Date: Sat, 19 Feb 2022 19:42:31 -0500
|
4 |
+
Subject: [PATCH] Fix bad import in jinja2
|
5 |
+
|
6 |
+
---
|
7 |
+
external/python/jinja2/utils.py | 6 +++++-
|
8 |
+
1 file changed, 5 insertions(+), 1 deletion(-)
|
9 |
+
|
10 |
+
diff --git a/external/python/jinja2/utils.py b/external/python/jinja2/utils.py
|
11 |
+
index db9c5d06..f198e3ef 100644
|
12 |
+
--- a/external/python/jinja2/utils.py
|
13 |
+
+++ b/external/python/jinja2/utils.py
|
14 |
+
@@ -639,4 +639,8 @@ def __repr__(self):
|
15 |
+
|
16 |
+
|
17 |
+
# Imported here because that's where it was in the past
|
18 |
+
-from markupsafe import Markup, escape, soft_unicode
|
19 |
+
+from markupsafe import Markup, escape
|
20 |
+
+try:
|
21 |
+
+ from markupsafe import soft_unicode
|
22 |
+
+except ImportError:
|
23 |
+
+ from markupsafe import soft_str as soft_unicode
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/fix-openxr-sdk-jsoncpp.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2 |
+
index c75b145..386494c 100644
|
3 |
+
--- a/src/CMakeLists.txt
|
4 |
+
+++ b/src/CMakeLists.txt
|
5 |
+
@@ -89,7 +89,7 @@ if(NOT VULKAN_INCOMPATIBLE)
|
6 |
+
endif()
|
7 |
+
|
8 |
+
find_package(Threads REQUIRED)
|
9 |
+
-find_package(JsonCpp)
|
10 |
+
+find_package(jsoncpp CONFIG REQUIRED)
|
11 |
+
|
12 |
+
### All options defined here
|
13 |
+
option(BUILD_LOADER "Build loader" ON)
|
14 |
+
diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
|
15 |
+
index 6a88cf4..0821a3d 100644
|
16 |
+
--- a/src/loader/CMakeLists.txt
|
17 |
+
+++ b/src/loader/CMakeLists.txt
|
18 |
+
@@ -68,7 +68,11 @@ add_library(openxr_loader ${LIBRARY_TYPE}
|
19 |
+
${openxr_loader_RESOURCE_FILE}
|
20 |
+
)
|
21 |
+
if(BUILD_WITH_SYSTEM_JSONCPP)
|
22 |
+
- target_link_libraries(openxr_loader PRIVATE JsonCpp::JsonCpp)
|
23 |
+
+ if(BUILD_SHARED_LIBS)
|
24 |
+
+ target_link_libraries(openxr_loader PRIVATE jsoncpp_lib)
|
25 |
+
+ else()
|
26 |
+
+ target_link_libraries(openxr_loader PRIVATE jsoncpp_static)
|
27 |
+
+ endif()
|
28 |
+
else()
|
29 |
+
target_sources(openxr_loader
|
30 |
+
PRIVATE
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/portfile.cmake
ADDED
@@ -0,0 +1,82 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
vcpkg_from_github(
|
3 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
4 |
+
REPO KhronosGroup/OpenXR-SDK
|
5 |
+
REF release-1.0.22
|
6 |
+
SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e
|
7 |
+
HEAD_REF master
|
8 |
+
PATCHES
|
9 |
+
fix-openxr-sdk-jsoncpp.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
vcpkg_from_github(
|
13 |
+
OUT_SOURCE_PATH SDK_SOURCE_PATH
|
14 |
+
REPO KhronosGroup/OpenXR-SDK-Source
|
15 |
+
REF release-1.0.22
|
16 |
+
SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651
|
17 |
+
HEAD_REF master
|
18 |
+
PATCHES
|
19 |
+
fix-openxr-sdk-jsoncpp.patch
|
20 |
+
fix-jinja2.patch
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_from_github(
|
24 |
+
OUT_SOURCE_PATH HPP_SOURCE_PATH
|
25 |
+
REPO KhronosGroup/OpenXR-hpp
|
26 |
+
REF release-1.0.21
|
27 |
+
SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36
|
28 |
+
HEAD_REF master
|
29 |
+
PATCHES
|
30 |
+
002-fix-hpp-gen.patch
|
31 |
+
)
|
32 |
+
|
33 |
+
# Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and
|
34 |
+
# vice-versa. Might be better in future iterations to patch the CMakeLists.txt for OpenXR
|
35 |
+
if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_WINDOWS)
|
36 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
37 |
+
set(DYNAMIC_LOADER OFF)
|
38 |
+
set(VCPKG_CRT_LINKAGE dynamic)
|
39 |
+
else()
|
40 |
+
set(DYNAMIC_LOADER ON)
|
41 |
+
set(VCPKG_CRT_LINKAGE static)
|
42 |
+
endif()
|
43 |
+
endif()
|
44 |
+
|
45 |
+
vcpkg_find_acquire_program(PYTHON3)
|
46 |
+
|
47 |
+
vcpkg_cmake_configure(
|
48 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
49 |
+
OPTIONS
|
50 |
+
-DBUILD_API_LAYERS=OFF
|
51 |
+
-DBUILD_TESTS=OFF
|
52 |
+
-DBUILD_CONFORMANCE_TESTS=OFF
|
53 |
+
-DDYNAMIC_LOADER=${DYNAMIC_LOADER}
|
54 |
+
-DPYTHON_EXECUTABLE="${PYTHON3}"
|
55 |
+
-DBUILD_WITH_SYSTEM_JSONCPP=ON
|
56 |
+
)
|
57 |
+
|
58 |
+
vcpkg_cmake_install()
|
59 |
+
|
60 |
+
# Generate the OpenXR C++ bindings
|
61 |
+
set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}")
|
62 |
+
file(STRINGS "${HPP_SOURCE_PATH}/headers.txt" HEADER_LIST REGEX "^openxr.*")
|
63 |
+
foreach(HEADER ${HEADER_LIST})
|
64 |
+
vcpkg_execute_required_process(
|
65 |
+
COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" ${HEADER}
|
66 |
+
WORKING_DIRECTORY "${HPP_SOURCE_PATH}"
|
67 |
+
LOGNAME openxrhpp
|
68 |
+
)
|
69 |
+
endforeach()
|
70 |
+
|
71 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
72 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake)
|
73 |
+
else()
|
74 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH lib/cmake/openxr)
|
75 |
+
endif()
|
76 |
+
|
77 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
78 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
79 |
+
|
80 |
+
vcpkg_fixup_pkgconfig()
|
81 |
+
vcpkg_copy_pdbs()
|
82 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openxr-loader/vcpkg.json
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openxr-loader",
|
3 |
+
"version": "1.0.22",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices",
|
6 |
+
"homepage": "https://github.com/KhronosGroup/OpenXR-SDK",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"supports": "!uwp & !osx",
|
9 |
+
"dependencies": [
|
10 |
+
"jsoncpp",
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake-config",
|
17 |
+
"host": true
|
18 |
+
}
|
19 |
+
],
|
20 |
+
"features": {
|
21 |
+
"vulkan": {
|
22 |
+
"description": "Vulkan functionality for OpenXR",
|
23 |
+
"dependencies": [
|
24 |
+
"vulkan"
|
25 |
+
]
|
26 |
+
}
|
27 |
+
}
|
28 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optimus-cpp/portfile.cmake
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO kafeg/optimus-cpp
|
4 |
+
REF 0.3.0
|
5 |
+
SHA512 93abd13d4552a896f61e32dfebcc9037e7255f3fa86b230c03905df3148b9cc91cec772ec733e83fbcad574fd93fa4dadca9ec88b5836c5a4137d01e16580d6f
|
6 |
+
HEAD_REF main
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_cmake_install()
|
14 |
+
vcpkg_copy_pdbs()
|
15 |
+
|
16 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
17 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optimus-cpp/vcpkg.json
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "optimus-cpp",
|
3 |
+
"version": "0.3.0",
|
4 |
+
"description": "ID hashing and Obfuscation using Knuth's Algorithm for C++",
|
5 |
+
"homepage": "https://github.com/kafeg/optimus-cpp",
|
6 |
+
"supports": "!uwp",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
}
|
12 |
+
]
|
13 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-bare/portfile.cmake
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO martinmoene/optional-bare
|
4 |
+
REF v1.1.0
|
5 |
+
SHA512 0eed103c4e909991b596c0cd23d6206662e3ca71cd8148e27c19d8e071c2a16e18cc940a6cd4f8571510f5e64577157f94c561fb889330bb7a868af64c2f3aa0
|
6 |
+
)
|
7 |
+
|
8 |
+
vcpkg_configure_cmake(
|
9 |
+
SOURCE_PATH ${SOURCE_PATH}
|
10 |
+
PREFER_NINJA
|
11 |
+
OPTIONS
|
12 |
+
-DOPTIONAL_BARE_OPT_BUILD_TESTS=OFF
|
13 |
+
-DOPTIONAL_BARE_OPT_BUILD_EXAMPLES=OFF
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_install_cmake()
|
17 |
+
|
18 |
+
vcpkg_fixup_cmake_targets(
|
19 |
+
CONFIG_PATH lib/cmake/${PORT}
|
20 |
+
)
|
21 |
+
|
22 |
+
file(REMOVE_RECURSE
|
23 |
+
${CURRENT_PACKAGES_DIR}/debug
|
24 |
+
${CURRENT_PACKAGES_DIR}/lib
|
25 |
+
)
|
26 |
+
|
27 |
+
file(INSTALL
|
28 |
+
${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
|
29 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-bare/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "optional-bare",
|
3 |
+
"version-string": "1.1.0",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library"
|
6 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-lite/portfile.cmake
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO martinmoene/optional-lite
|
4 |
+
REF v3.5.0
|
5 |
+
SHA512 e578d391bc95e2a5302b4b02e0b17659026b2743fc5c1e16cd83f6227fa9b5990fa3fa23e808a4ea0f5bdafbf80834b0c462d563ab615907f113ee5a09ae88f5
|
6 |
+
)
|
7 |
+
|
8 |
+
vcpkg_cmake_configure(
|
9 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
10 |
+
OPTIONS
|
11 |
+
-DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF
|
12 |
+
-DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_cmake_install()
|
16 |
+
|
17 |
+
vcpkg_cmake_config_fixup(
|
18 |
+
CONFIG_PATH "lib/cmake/${PORT}"
|
19 |
+
)
|
20 |
+
|
21 |
+
file(REMOVE_RECURSE
|
22 |
+
"${CURRENT_PACKAGES_DIR}/debug"
|
23 |
+
"${CURRENT_PACKAGES_DIR}/lib"
|
24 |
+
)
|
25 |
+
|
26 |
+
file(INSTALL
|
27 |
+
"${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright
|
28 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/optional-lite/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "optional-lite",
|
3 |
+
"version": "3.5.0",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library",
|
6 |
+
"homepage": "https://github.com/martinmoene/optional-lite",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opus/portfile.cmake
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH
|
3 |
+
SOURCE_PATH
|
4 |
+
REPO
|
5 |
+
xiph/opus
|
6 |
+
REF
|
7 |
+
5c94ec3205c30171ffd01056f5b4622b7c0ab54c
|
8 |
+
SHA512
|
9 |
+
2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea
|
10 |
+
HEAD_REF
|
11 |
+
master)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
avx AVX_SUPPORTED
|
15 |
+
)
|
16 |
+
|
17 |
+
if(VCPKG_TARGET_IS_MINGW)
|
18 |
+
set(STACK_PROTECTOR OFF)
|
19 |
+
string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0")
|
20 |
+
string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0")
|
21 |
+
else()
|
22 |
+
set(STACK_PROTECTOR ON)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
vcpkg_configure_cmake(
|
26 |
+
SOURCE_PATH ${SOURCE_PATH}
|
27 |
+
OPTIONS ${FEATURE_OPTIONS}
|
28 |
+
-DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR}
|
29 |
+
PREFER_NINJA)
|
30 |
+
vcpkg_install_cmake()
|
31 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus)
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
|
34 |
+
|
35 |
+
file(INSTALL
|
36 |
+
${SOURCE_PATH}/COPYING
|
37 |
+
DESTINATION
|
38 |
+
${CURRENT_PACKAGES_DIR}/share/opus
|
39 |
+
RENAME copyright)
|
40 |
+
|
41 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake
|
42 |
+
${CURRENT_PACKAGES_DIR}/lib/cmake
|
43 |
+
${CURRENT_PACKAGES_DIR}/debug/include)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opus/vcpkg.json
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opus",
|
3 |
+
"version-string": "1.3.1",
|
4 |
+
"port-version": 6,
|
5 |
+
"description": "Totally open, royalty-free, highly versatile audio codec",
|
6 |
+
"homepage": "https://github.com/xiph/opus",
|
7 |
+
"features": {
|
8 |
+
"avx": {
|
9 |
+
"description": "Builds the library with avx instruction set"
|
10 |
+
}
|
11 |
+
}
|
12 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/CMakeLists.txt
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.4)
|
2 |
+
project(opusfile C)
|
3 |
+
|
4 |
+
if(MSVC)
|
5 |
+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4090")
|
6 |
+
endif()
|
7 |
+
|
8 |
+
find_path(OGG_INCLUDE_DIR ogg/ogg.h)
|
9 |
+
find_library(OGG_LIBRARY ogg)
|
10 |
+
|
11 |
+
find_path(OPUS_INCLUDE_DIR opus.h PATH_SUFFIXES opus)
|
12 |
+
find_library(OPUS_LIBRARY opus)
|
13 |
+
|
14 |
+
add_library(opusfile
|
15 |
+
src/info.c
|
16 |
+
src/internal.c
|
17 |
+
src/opusfile.c
|
18 |
+
src/stream.c)
|
19 |
+
|
20 |
+
target_include_directories(opusfile PRIVATE include PUBLIC ${OGG_INCLUDE_DIR} ${OPUS_INCLUDE_DIR})
|
21 |
+
target_link_libraries(opusfile PRIVATE ${OGG_LIBRARY} ${OPUS_LIBRARY})
|
22 |
+
|
23 |
+
install(TARGETS opusfile
|
24 |
+
RUNTIME DESTINATION bin
|
25 |
+
LIBRARY DESTINATION lib
|
26 |
+
ARCHIVE DESTINATION lib)
|
27 |
+
|
28 |
+
if(BUILD_OPUSURL)
|
29 |
+
find_package(OpenSSL MODULE REQUIRED)
|
30 |
+
|
31 |
+
add_library(opusurl
|
32 |
+
src/http.c
|
33 |
+
src/wincerts.c)
|
34 |
+
|
35 |
+
target_compile_definitions(opusurl PRIVATE OP_ENABLE_HTTP)
|
36 |
+
target_include_directories(opusurl PRIVATE include)
|
37 |
+
target_link_libraries(opusurl PRIVATE opusfile OpenSSL::SSL ws2_32.lib crypt32.lib)
|
38 |
+
|
39 |
+
install(TARGETS opusurl
|
40 |
+
RUNTIME DESTINATION bin
|
41 |
+
LIBRARY DESTINATION lib
|
42 |
+
ARCHIVE DESTINATION lib)
|
43 |
+
endif()
|
44 |
+
|
45 |
+
if(NOT OPUSFILE_SKIP_HEADERS)
|
46 |
+
install(FILES include/opusfile.h
|
47 |
+
DESTINATION include/opus)
|
48 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/portfile.cmake
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
|
4 |
+
message(FATAL_ERROR "UWP builds not supported")
|
5 |
+
endif()
|
6 |
+
|
7 |
+
vcpkg_from_github(
|
8 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
9 |
+
REPO xiph/opusfile
|
10 |
+
REF a55c164e9891a9326188b7d4d216ec9a88373739 # v0.12
|
11 |
+
SHA512 cfe90b63b8ec027caf6d472167aba863e62f02650245cf0e4d9a543bb565c9088d38b45f7dc2d42cdfcdac5397c3757f4377c24afee73cac52437c125830c411
|
12 |
+
HEAD_REF master)
|
13 |
+
|
14 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
15 |
+
|
16 |
+
if("opusurl" IN_LIST FEATURES)
|
17 |
+
set(BUILD_OPUSURL ON)
|
18 |
+
else()
|
19 |
+
set(BUILD_OPUSURL OFF)
|
20 |
+
endif()
|
21 |
+
|
22 |
+
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
|
23 |
+
PREFER_NINJA
|
24 |
+
OPTIONS
|
25 |
+
-DBUILD_OPUSURL=${BUILD_OPUSURL}
|
26 |
+
OPTIONS_DEBUG
|
27 |
+
-DOPUSFILE_SKIP_HEADERS=ON)
|
28 |
+
|
29 |
+
vcpkg_install_cmake()
|
30 |
+
vcpkg_copy_pdbs()
|
31 |
+
|
32 |
+
# make includes work with MSBuild integration
|
33 |
+
file(READ ${CURRENT_PACKAGES_DIR}/include/opus/opusfile.h OPUSFILE_H)
|
34 |
+
string(REPLACE "# include <opus_multistream.h>" "# include \"opus_multistream.h\"" OPUSFILE_H "${OPUSFILE_H}")
|
35 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/include/opus/opusfile.h "${OPUSFILE_H}")
|
36 |
+
|
37 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/opusfile)
|
38 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/share/opusfile/COPYING ${CURRENT_PACKAGES_DIR}/share/opusfile/copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opusfile/vcpkg.json
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opusfile",
|
3 |
+
"version-string": "0.12",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Stand-alone decoder library for .opus streams",
|
6 |
+
"homepage": "https://github.com/xiph/opusfile",
|
7 |
+
"supports": "!uwp",
|
8 |
+
"dependencies": [
|
9 |
+
"libogg",
|
10 |
+
"opus"
|
11 |
+
],
|
12 |
+
"features": {
|
13 |
+
"opusurl": {
|
14 |
+
"description": "Support decoding of http(s) streams",
|
15 |
+
"dependencies": [
|
16 |
+
"openssl"
|
17 |
+
]
|
18 |
+
}
|
19 |
+
}
|
20 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch
ADDED
@@ -0,0 +1,162 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
|
2 |
+
index 3d4a162..6926bc3 100644
|
3 |
+
--- a/c++/src/CMakeLists.txt
|
4 |
+
+++ b/c++/src/CMakeLists.txt
|
5 |
+
@@ -230,12 +230,13 @@ endif(BUILD_LIBHDFSPP)
|
6 |
+
add_library (orc STATIC ${SOURCE_FILES})
|
7 |
+
|
8 |
+
target_link_libraries (orc
|
9 |
+
- protobuf
|
10 |
+
- zlib
|
11 |
+
- snappy
|
12 |
+
- lz4
|
13 |
+
- zstd
|
14 |
+
- ${LIBHDFSPP_LIBRARIES}
|
15 |
+
+ PRIVATE
|
16 |
+
+ protobuf::libprotobuf
|
17 |
+
+ ZLIB::ZLIB
|
18 |
+
+ Snappy::snappy
|
19 |
+
+ lz4::lz4
|
20 |
+
+ $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
|
21 |
+
+ ${LIBHDFSPP_LIBRARIES}
|
22 |
+
)
|
23 |
+
|
24 |
+
install(TARGETS orc DESTINATION lib)
|
25 |
+
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
26 |
+
index 3a35325..56ffd74 100644
|
27 |
+
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
28 |
+
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
29 |
+
@@ -59,8 +59,8 @@ endif ()
|
30 |
+
# ----------------------------------------------------------------------
|
31 |
+
# Snappy
|
32 |
+
|
33 |
+
-if (NOT "${SNAPPY_HOME}" STREQUAL "")
|
34 |
+
- find_package (Snappy REQUIRED)
|
35 |
+
+if (1)
|
36 |
+
+ find_package (Snappy CONFIG REQUIRED)
|
37 |
+
set(SNAPPY_VENDORED FALSE)
|
38 |
+
else ()
|
39 |
+
set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
|
40 |
+
@@ -78,10 +78,6 @@ else ()
|
41 |
+
set(SNAPPY_VENDORED TRUE)
|
42 |
+
endif ()
|
43 |
+
|
44 |
+
-include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
|
45 |
+
-add_library (snappy STATIC IMPORTED)
|
46 |
+
-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
|
47 |
+
-
|
48 |
+
if (SNAPPY_VENDORED)
|
49 |
+
add_dependencies (snappy snappy_ep)
|
50 |
+
if (INSTALL_VENDORED_LIBS)
|
51 |
+
@@ -93,7 +89,7 @@ endif ()
|
52 |
+
# ----------------------------------------------------------------------
|
53 |
+
# ZLIB
|
54 |
+
|
55 |
+
-if (NOT "${ZLIB_HOME}" STREQUAL "")
|
56 |
+
+if (1)
|
57 |
+
find_package (ZLIB REQUIRED)
|
58 |
+
set(ZLIB_VENDORED FALSE)
|
59 |
+
else ()
|
60 |
+
@@ -120,10 +116,6 @@ else ()
|
61 |
+
set(ZLIB_VENDORED TRUE)
|
62 |
+
endif ()
|
63 |
+
|
64 |
+
-include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
|
65 |
+
-add_library (zlib STATIC IMPORTED)
|
66 |
+
-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
|
67 |
+
-
|
68 |
+
if (ZLIB_VENDORED)
|
69 |
+
add_dependencies (zlib zlib_ep)
|
70 |
+
if (INSTALL_VENDORED_LIBS)
|
71 |
+
@@ -135,8 +127,8 @@ endif ()
|
72 |
+
# ----------------------------------------------------------------------
|
73 |
+
# Zstd
|
74 |
+
|
75 |
+
-if (NOT "${ZSTD_HOME}" STREQUAL "")
|
76 |
+
- find_package (ZSTD REQUIRED)
|
77 |
+
+if (1)
|
78 |
+
+ find_package (zstd CONFIG REQUIRED)
|
79 |
+
set(ZSTD_VENDORED FALSE)
|
80 |
+
else ()
|
81 |
+
set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
|
82 |
+
@@ -169,10 +161,6 @@ else ()
|
83 |
+
set(ZSTD_VENDORED TRUE)
|
84 |
+
endif ()
|
85 |
+
|
86 |
+
-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
|
87 |
+
-add_library (zstd STATIC IMPORTED)
|
88 |
+
-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
|
89 |
+
-
|
90 |
+
if (ZSTD_VENDORED)
|
91 |
+
add_dependencies (zstd zstd_ep)
|
92 |
+
if (INSTALL_VENDORED_LIBS)
|
93 |
+
@@ -184,8 +172,8 @@ endif ()
|
94 |
+
# ----------------------------------------------------------------------
|
95 |
+
# LZ4
|
96 |
+
|
97 |
+
-if (NOT "${LZ4_HOME}" STREQUAL "")
|
98 |
+
- find_package (LZ4 REQUIRED)
|
99 |
+
+if (1)
|
100 |
+
+ find_package (lz4 CONFIG REQUIRED)
|
101 |
+
set(LZ4_VENDORED FALSE)
|
102 |
+
else ()
|
103 |
+
set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
|
104 |
+
@@ -211,10 +199,6 @@ else ()
|
105 |
+
set(LZ4_VENDORED TRUE)
|
106 |
+
endif ()
|
107 |
+
|
108 |
+
-include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
|
109 |
+
-add_library (lz4 STATIC IMPORTED)
|
110 |
+
-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
|
111 |
+
-
|
112 |
+
if (LZ4_VENDORED)
|
113 |
+
add_dependencies (lz4 lz4_ep)
|
114 |
+
if (INSTALL_VENDORED_LIBS)
|
115 |
+
@@ -288,8 +272,8 @@ endif ()
|
116 |
+
# ----------------------------------------------------------------------
|
117 |
+
# Protobuf
|
118 |
+
|
119 |
+
-if (NOT "${PROTOBUF_HOME}" STREQUAL "")
|
120 |
+
- find_package (Protobuf REQUIRED)
|
121 |
+
+if (1)
|
122 |
+
+ find_package (Protobuf CONFIG REQUIRED)
|
123 |
+
set(PROTOBUF_VENDORED FALSE)
|
124 |
+
else ()
|
125 |
+
set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
|
126 |
+
@@ -327,12 +311,6 @@ endif ()
|
127 |
+
|
128 |
+
include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
|
129 |
+
|
130 |
+
-add_library (protobuf STATIC IMPORTED)
|
131 |
+
-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})
|
132 |
+
-
|
133 |
+
-add_library (protoc STATIC IMPORTED)
|
134 |
+
-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB})
|
135 |
+
-
|
136 |
+
if (PROTOBUF_VENDORED)
|
137 |
+
add_dependencies (protoc protobuf_ep)
|
138 |
+
add_dependencies (protobuf protobuf_ep)
|
139 |
+
diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
|
140 |
+
index f5a53ca..ec22e7a 100644
|
141 |
+
--- a/tools/src/CMakeLists.txt
|
142 |
+
+++ b/tools/src/CMakeLists.txt
|
143 |
+
@@ -51,7 +51,6 @@ add_executable (orc-metadata
|
144 |
+
|
145 |
+
target_link_libraries (orc-metadata
|
146 |
+
orc
|
147 |
+
- protobuf
|
148 |
+
${CMAKE_THREAD_LIBS_INIT}
|
149 |
+
)
|
150 |
+
|
151 |
+
@@ -92,7 +91,7 @@ target_link_libraries (csv-import
|
152 |
+
)
|
153 |
+
|
154 |
+
install(TARGETS
|
155 |
+
- orc-contents
|
156 |
+
- orc-metadata
|
157 |
+
- orc-statistics
|
158 |
+
- DESTINATION bin)
|
159 |
+
+ orc-scan
|
160 |
+
+ orc-memory
|
161 |
+
+ csv-import
|
162 |
+
+ DESTINATION tools/orc)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/0005-disable-tzdata.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
|
2 |
+
index ea39023..599d79a 100644
|
3 |
+
--- a/c++/test/CMakeLists.txt
|
4 |
+
+++ b/c++/test/CMakeLists.txt
|
5 |
+
@@ -67,6 +67,7 @@ target_link_libraries (create-test-files
|
6 |
+
protobuf
|
7 |
+
)
|
8 |
+
|
9 |
+
+if (ENABLE_TEST)
|
10 |
+
if (TEST_VALGRIND_MEMCHECK)
|
11 |
+
add_test (orc-test
|
12 |
+
valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test)
|
13 |
+
@@ -86,3 +87,4 @@ if (WIN32)
|
14 |
+
ENVIRONMENT "TZDIR=${TZDATA_DIR}"
|
15 |
+
)
|
16 |
+
endif ()
|
17 |
+
+endif()
|
18 |
+
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
19 |
+
index 3a35325..364470b 100644
|
20 |
+
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
21 |
+
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
22 |
+
@@ -226,7 +226,7 @@ endif ()
|
23 |
+
# ----------------------------------------------------------------------
|
24 |
+
# IANA - Time Zone Database
|
25 |
+
|
26 |
+
-if (WIN32)
|
27 |
+
+if (WIN32 AND TEST_VALGRIND_MEMCHECK)
|
28 |
+
ExternalProject_Add(tzdata_ep
|
29 |
+
URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz"
|
30 |
+
URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/portfile.cmake
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO apache/orc
|
4 |
+
REF 23ecc03e87548f6d6783c2d8af2b46672c52214c # rel/release-1.6.4
|
5 |
+
SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
0003-dependencies-from-vcpkg.patch
|
9 |
+
0005-disable-tzdata.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
|
13 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake")
|
14 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake")
|
15 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake")
|
16 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake")
|
17 |
+
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake")
|
18 |
+
|
19 |
+
if(CMAKE_HOST_WIN32)
|
20 |
+
set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc.exe)
|
21 |
+
else()
|
22 |
+
set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
26 |
+
set(BUILD_TOOLS OFF)
|
27 |
+
else()
|
28 |
+
set(BUILD_TOOLS ON)
|
29 |
+
endif()
|
30 |
+
|
31 |
+
vcpkg_configure_cmake(
|
32 |
+
SOURCE_PATH ${SOURCE_PATH}
|
33 |
+
PREFER_NINJA
|
34 |
+
OPTIONS
|
35 |
+
-DBUILD_TOOLS=${BUILD_TOOLS}
|
36 |
+
-DBUILD_CPP_TESTS=OFF
|
37 |
+
-DBUILD_JAVA=OFF
|
38 |
+
-DINSTALL_VENDORED_LIBS=OFF
|
39 |
+
-DBUILD_LIBHDFSPP=OFF
|
40 |
+
-DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE}
|
41 |
+
-DSTOP_BUILD_ON_WARNING=OFF
|
42 |
+
-DENABLE_TEST=OFF
|
43 |
+
)
|
44 |
+
|
45 |
+
vcpkg_install_cmake()
|
46 |
+
vcpkg_copy_pdbs()
|
47 |
+
|
48 |
+
file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*)
|
49 |
+
if(TOOLS)
|
50 |
+
file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/orc)
|
51 |
+
file(REMOVE ${TOOLS})
|
52 |
+
endif()
|
53 |
+
|
54 |
+
file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*)
|
55 |
+
if(NOT BINS)
|
56 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
57 |
+
endif()
|
58 |
+
|
59 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
60 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
61 |
+
|
62 |
+
|
63 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
64 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/usage
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package orc does not provide CMake targets:
|
2 |
+
|
3 |
+
find_package(protobuf CONFIG REQUIRED)
|
4 |
+
find_package(ZLIB REQUIRED)
|
5 |
+
find_package(Snappy CONFIG REQUIRED)
|
6 |
+
|
7 |
+
find_library(LZ4_LIBRARY NAMES lz4d lz4)
|
8 |
+
find_library(ZSTD_LIBRARY NAMES zstd)
|
9 |
+
find_library(ORC_LIBRARY NAMES orc)
|
10 |
+
|
11 |
+
target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orc/vcpkg.json
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "orc",
|
3 |
+
"version-string": "1.6.4",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "The smallest, fastest columnar storage for Hadoop workloads.",
|
6 |
+
"homepage": "https://orc.apache.org/",
|
7 |
+
"dependencies": [
|
8 |
+
"gtest",
|
9 |
+
"lz4",
|
10 |
+
"protobuf",
|
11 |
+
"snappy",
|
12 |
+
"zlib",
|
13 |
+
"zstd"
|
14 |
+
]
|
15 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/export-include-dir.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/orocos_kdl/src/CMakeLists.txt b/orocos_kdl/src/CMakeLists.txt
|
2 |
+
index 079ca8a..07eff4f 100644
|
3 |
+
--- a/orocos_kdl/src/CMakeLists.txt
|
4 |
+
+++ b/orocos_kdl/src/CMakeLists.txt
|
5 |
+
@@ -126,7 +126,7 @@ ENDIF()
|
6 |
+
#####end RPATH
|
7 |
+
|
8 |
+
# Needed so that the generated config.h can be used
|
9 |
+
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
10 |
+
+TARGET_INCLUDE_DIRECTORIES(orocos-kdl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
|
11 |
+
TARGET_LINK_LIBRARIES(orocos-kdl ${Boost_LIBRARIES})
|
12 |
+
|
13 |
+
INSTALL(TARGETS orocos-kdl
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/portfile.cmake
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO orocos/orocos_kinematics_dynamics
|
4 |
+
REF v1.4.0
|
5 |
+
SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES export-include-dir.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_configure_cmake(
|
11 |
+
SOURCE_PATH ${SOURCE_PATH}/orocos_kdl
|
12 |
+
PREFER_NINJA
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_install_cmake()
|
16 |
+
|
17 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH share/orocos_kdl/cmake TARGET_PATH share/orocos_kdl)
|
18 |
+
|
19 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/orocos_kdl/orocos_kdl-config.cmake _contents)
|
20 |
+
string(REPLACE "\${CMAKE_CURRENT_LIST_DIR}/../../.." "\${CMAKE_CURRENT_LIST_DIR}/../.." _contents "${_contents}")
|
21 |
+
string(REPLACE "\${_IMPORT_PREFIX}" "\${CMAKE_CURRENT_LIST_DIR}/../.." _contents "${_contents}")
|
22 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/orocos_kdl/orocos_kdl-config.cmake "${_contents}")
|
23 |
+
|
24 |
+
file(REMOVE_RECURSE
|
25 |
+
${CURRENT_PACKAGES_DIR}/debug/include
|
26 |
+
${CURRENT_PACKAGES_DIR}/debug/share
|
27 |
+
${CURRENT_PACKAGES_DIR}/share/doc
|
28 |
+
${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl)
|
29 |
+
|
30 |
+
file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
31 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/orocos-kdl/vcpkg.json
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "orocos-kdl",
|
3 |
+
"version": "1.4",
|
4 |
+
"port-version": 5,
|
5 |
+
"description": "Kinematics and Dynamics Library.",
|
6 |
+
"homepage": "https://github.com/orocos/orocos_kinematics_dynamics",
|
7 |
+
"dependencies": [
|
8 |
+
"eigen3"
|
9 |
+
]
|
10 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/collada.patch
ADDED
@@ -0,0 +1,126 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake
|
2 |
+
index 7c7d290..5b456d7 100644
|
3 |
+
--- a/CMakeModules/FindCOLLADA.cmake
|
4 |
+
+++ b/CMakeModules/FindCOLLADA.cmake
|
5 |
+
@@ -29,10 +29,7 @@ IF(APPLE)
|
6 |
+
ELSEIF(MINGW)
|
7 |
+
SET(COLLADA_BUILDNAME "mingw")
|
8 |
+
SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
|
9 |
+
-ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910))
|
10 |
+
- SET(COLLADA_BUILDNAME "vc14")
|
11 |
+
- SET(COLLADA_BOOST_BUILDNAME "vc141")
|
12 |
+
-ELSEIF(MSVC_VERSION EQUAL 1900)
|
13 |
+
+ELSEIF(MSVC_VERSION GREATER_EQUAL 1900)
|
14 |
+
SET(COLLADA_BUILDNAME "vc14")
|
15 |
+
SET(COLLADA_BOOST_BUILDNAME "vc140")
|
16 |
+
ELSEIF(MSVC_VERSION EQUAL 1800)
|
17 |
+
@@ -61,6 +58,7 @@ ENDIF()
|
18 |
+
|
19 |
+
|
20 |
+
FIND_PATH(COLLADA_INCLUDE_DIR dae.h
|
21 |
+
+ PATHS
|
22 |
+
${COLLADA_DOM_ROOT}/include
|
23 |
+
$ENV{COLLADA_DIR}/include
|
24 |
+
$ENV{COLLADA_DIR}
|
25 |
+
@@ -68,27 +66,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
|
26 |
+
/Library/Frameworks
|
27 |
+
/opt/local/Library/Frameworks #macports
|
28 |
+
/usr/local/include
|
29 |
+
- /usr/local/include/colladadom
|
30 |
+
- /usr/local/include/collada-dom
|
31 |
+
- /usr/local/include/collada-dom2.5
|
32 |
+
- /usr/local/include/collada-dom2.4
|
33 |
+
- /usr/local/include/collada-dom2.2
|
34 |
+
- /opt/local/include/collada-dom
|
35 |
+
- /opt/local/include/collada-dom2.5
|
36 |
+
- /opt/local/include/collada-dom2.4
|
37 |
+
- /opt/local/include/collada-dom2.2
|
38 |
+
/usr/include/
|
39 |
+
- /usr/include/colladadom
|
40 |
+
- /usr/include/collada-dom
|
41 |
+
- /usr/include/collada-dom2.5
|
42 |
+
- /usr/include/collada-dom2.4
|
43 |
+
- /usr/include/collada-dom2.2
|
44 |
+
/sw/include # Fink
|
45 |
+
/opt/local/include # DarwinPorts
|
46 |
+
/opt/csw/include # Blastwave
|
47 |
+
/opt/include
|
48 |
+
/usr/freeware/include
|
49 |
+
${ACTUAL_3DPARTY_DIR}/include
|
50 |
+
+ PATH_SUFFIXES
|
51 |
+
+ colladadom
|
52 |
+
+ collada-dom
|
53 |
+
+ collada-dom2.5
|
54 |
+
+ collada-dom2.4
|
55 |
+
+ collada-dom2.2
|
56 |
+
)
|
57 |
+
|
58 |
+
FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
|
59 |
+
@@ -116,7 +106,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
|
60 |
+
)
|
61 |
+
|
62 |
+
FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG
|
63 |
+
- NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d
|
64 |
+
+ NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt
|
65 |
+
PATHS
|
66 |
+
${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
|
67 |
+
${COLLADA_DOM_ROOT}
|
68 |
+
@@ -279,7 +269,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
|
69 |
+
)
|
70 |
+
|
71 |
+
FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
|
72 |
+
- NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63
|
73 |
+
+ NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt
|
74 |
+
PATHS
|
75 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
|
76 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
|
77 |
+
@@ -287,7 +277,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
|
78 |
+
)
|
79 |
+
|
80 |
+
FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
|
81 |
+
- NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
|
82 |
+
+ NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd
|
83 |
+
PATHS
|
84 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
|
85 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
|
86 |
+
@@ -295,7 +285,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
|
87 |
+
)
|
88 |
+
|
89 |
+
FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
|
90 |
+
- NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63
|
91 |
+
+ NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt
|
92 |
+
PATHS
|
93 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
|
94 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
|
95 |
+
@@ -303,7 +293,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
|
96 |
+
)
|
97 |
+
|
98 |
+
FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
|
99 |
+
- NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
|
100 |
+
+ NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd
|
101 |
+
PATHS
|
102 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
|
103 |
+
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
|
104 |
+
@@ -329,5 +319,3 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
|
105 |
+
|
106 |
+
ENDIF()
|
107 |
+
ENDIF()
|
108 |
+
-
|
109 |
+
-
|
110 |
+
|
111 |
+
diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt
|
112 |
+
index af03fb866..7eadfc2f3 100644
|
113 |
+
--- a/src/osgPlugins/dae/CMakeLists.txt
|
114 |
+
+++ b/src/osgPlugins/dae/CMakeLists.txt
|
115 |
+
@@ -49,7 +49,9 @@ ELSE()
|
116 |
+
ENDIF()
|
117 |
+
|
118 |
+
ADD_DEFINITIONS(-DNO_BOOST)
|
119 |
+
-ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141)
|
120 |
+
+ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141
|
121 |
+
+ -DCOLLADA_DOM_SUPPORT141
|
122 |
+
+ -DCOLLADA_DOM_SUPPORT150)
|
123 |
+
|
124 |
+
IF (COLLADA_DOM_2_4_OR_LATER)
|
125 |
+
ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER)
|
126 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/disable-present3d-staticview-in-linux.patch
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
|
2 |
+
index ab491c6..bee3d1f 100644
|
3 |
+
--- a/applications/CMakeLists.txt
|
4 |
+
+++ b/applications/CMakeLists.txt
|
5 |
+
@@ -32,12 +32,16 @@ IF(DYNAMIC_OPENSCENEGRAPH)
|
6 |
+
ADD_SUBDIRECTORY(osgconv)
|
7 |
+
ADD_SUBDIRECTORY(osgfilecache)
|
8 |
+
ADD_SUBDIRECTORY(osgversion)
|
9 |
+
- ADD_SUBDIRECTORY(present3D)
|
10 |
+
+ if (NOT UNIX)
|
11 |
+
+ ADD_SUBDIRECTORY(present3D)
|
12 |
+
+ endif()
|
13 |
+
ELSE()
|
14 |
+
# need to define this on win32 or linker cries about _declspecs
|
15 |
+
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
16 |
+
|
17 |
+
ADD_SUBDIRECTORY(osgversion)
|
18 |
+
- ADD_SUBDIRECTORY(present3D)
|
19 |
+
+ if (NOT UNIX)
|
20 |
+
+ ADD_SUBDIRECTORY(present3D)
|
21 |
+
+ endif()
|
22 |
+
ENDIF()
|
23 |
+
|
24 |
+
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
|
25 |
+
index 788e507..3c550bc 100644
|
26 |
+
--- a/examples/CMakeLists.txt
|
27 |
+
+++ b/examples/CMakeLists.txt
|
28 |
+
@@ -245,7 +245,7 @@ ELSE(DYNAMIC_OPENSCENEGRAPH)
|
29 |
+
|
30 |
+
IF(OSG_BUILD_PLATFORM_IPHONE)
|
31 |
+
ADD_SUBDIRECTORY(osgviewerIPhone)
|
32 |
+
- ELSE()
|
33 |
+
+ ELSEIF (NOT UNIX)
|
34 |
+
ADD_SUBDIRECTORY(osgstaticviewer)
|
35 |
+
ENDIF()
|
36 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-curl.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/osgPlugins/curl/CMakeLists.txt b/src/osgPlugins/curl/CMakeLists.txt
|
2 |
+
index cc459ff..370dbec 100644
|
3 |
+
--- a/src/osgPlugins/curl/CMakeLists.txt
|
4 |
+
+++ b/src/osgPlugins/curl/CMakeLists.txt
|
5 |
+
@@ -23,11 +23,11 @@ SET(TARGET_H
|
6 |
+
|
7 |
+
IF(ZLIB_FOUND)
|
8 |
+
SET(TARGET_LIBRARIES_VARS
|
9 |
+
- CURL_LIBRARY
|
10 |
+
+ CURL_LIBRARIES
|
11 |
+
ZLIB_LIBRARIES)
|
12 |
+
ELSE()
|
13 |
+
SET(TARGET_LIBRARIES_VARS
|
14 |
+
- CURL_LIBRARY)
|
15 |
+
+ CURL_LIBRARIES)
|
16 |
+
ENDIF()
|
17 |
+
|
18 |
+
IF(WIN32 OR MINGW)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-dependency-coin.patch
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 798b8b9..c975d78 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -740,7 +740,7 @@ ELSE()
|
6 |
+
# Common to all platforms except android:
|
7 |
+
FIND_PACKAGE(Freetype)
|
8 |
+
FIND_PACKAGE(ilmbase)
|
9 |
+
- FIND_PACKAGE(Inventor)
|
10 |
+
+ FIND_PACKAGE(coin CONFIG)
|
11 |
+
FIND_PACKAGE(Jasper)
|
12 |
+
FIND_PACKAGE(OpenEXR)
|
13 |
+
FIND_PACKAGE(OpenCascade)
|
14 |
+
diff --git a/src/osgPlugins/Inventor/CMakeLists.txt b/src/osgPlugins/Inventor/CMakeLists.txt
|
15 |
+
index 963a494..e34b6b8 100644
|
16 |
+
--- a/src/osgPlugins/Inventor/CMakeLists.txt
|
17 |
+
+++ b/src/osgPlugins/Inventor/CMakeLists.txt
|
18 |
+
@@ -17,10 +17,6 @@ SET(TARGET_HDRS
|
19 |
+
ShuttleCallback.h
|
20 |
+
)
|
21 |
+
|
22 |
+
-ADD_DEFINITIONS(-DCOIN_DLL)
|
23 |
+
-
|
24 |
+
-INCLUDE_DIRECTORIES(${INVENTOR_INCLUDE_DIR})
|
25 |
+
-
|
26 |
+
-SET(TARGET_ADDED_LIBRARIES ${INVENTOR_LIBRARY})
|
27 |
+
+SET(TARGET_ADDED_LIBRARIES Coin::Coin)
|
28 |
+
|
29 |
+
SETUP_PLUGIN(iv iv)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-example-application.patch
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/applications/present3D/CMakeLists.txt b/applications/present3D/CMakeLists.txt
|
2 |
+
index df859d0..123313a 100644
|
3 |
+
--- a/applications/present3D/CMakeLists.txt
|
4 |
+
+++ b/applications/present3D/CMakeLists.txt
|
5 |
+
@@ -103,6 +103,11 @@ ENDIF()
|
6 |
+
IF (WIN32)
|
7 |
+
# to support cluster code
|
8 |
+
SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32)
|
9 |
+
+
|
10 |
+
+ find_package(EXPAT REQUIRED)
|
11 |
+
+ find_package(Iconv REQUIRED)
|
12 |
+
+
|
13 |
+
+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
|
14 |
+
ELSE()
|
15 |
+
CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME)
|
16 |
+
IF(LIB_NSL_HAS_GETHOSTBYNAME)
|
17 |
+
diff --git a/examples/osgstaticviewer/CMakeLists.txt b/examples/osgstaticviewer/CMakeLists.txt
|
18 |
+
index 071ab26..bf8d85f 100644
|
19 |
+
--- a/examples/osgstaticviewer/CMakeLists.txt
|
20 |
+
+++ b/examples/osgstaticviewer/CMakeLists.txt
|
21 |
+
@@ -19,6 +19,13 @@ IF(FREETYPE_FOUND)
|
22 |
+
SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype)
|
23 |
+
ENDIF(FREETYPE_FOUND)
|
24 |
+
|
25 |
+
+IF (WIN32)
|
26 |
+
+ find_package(EXPAT REQUIRED)
|
27 |
+
+ find_package(Iconv REQUIRED)
|
28 |
+
+
|
29 |
+
+ list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
|
30 |
+
+ENDIF()
|
31 |
+
+
|
32 |
+
SET(TARGET_SRC osgstaticviewer.cpp )
|
33 |
+
#### end var setup ###
|
34 |
+
SETUP_EXAMPLE(osgstaticviewer)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-liblas.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index b84fa06..a991670 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -765,7 +765,10 @@ ELSE()
|
6 |
+
ENDIF()
|
7 |
+
FIND_PACKAGE(ZeroConf)
|
8 |
+
|
9 |
+
- FIND_PACKAGE(LIBLAS)
|
10 |
+
+ FIND_PACKAGE(liblas CONFIG)
|
11 |
+
+ set(LIBLAS_FOUND ${liblas_FOUND})
|
12 |
+
+ set(LIBLAS_LIBRARY liblas)
|
13 |
+
+ set(LIBLASC_LIBRARY liblas_c)
|
14 |
+
|
15 |
+
IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
|
16 |
+
FIND_PACKAGE(Lua52)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-nvtt.patch
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index a991670..5b530c5 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -759,7 +759,9 @@ ELSE()
|
6 |
+
FIND_PACKAGE(RSVG)
|
7 |
+
FIND_PACKAGE(GtkGl)
|
8 |
+
FIND_PACKAGE(DirectInput)
|
9 |
+
+ if (ENABLE_NVTT)
|
10 |
+
FIND_PACKAGE(NVTT)
|
11 |
+
+ endif()
|
12 |
+
IF (NOT WIN32)
|
13 |
+
FIND_PACKAGE(Asio)
|
14 |
+
ENDIF()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/fix-sdl.patch
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 81328ea..c735419 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -755,8 +755,6 @@ ELSE()
|
6 |
+
FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
|
7 |
+
FIND_PACKAGE(GLIB COMPONENTS gobject)
|
8 |
+
FIND_PACKAGE(DirectShow)
|
9 |
+
- FIND_PACKAGE(SDL2)
|
10 |
+
- FIND_PACKAGE(SDL)
|
11 |
+
FIND_PACKAGE(Poppler-glib)
|
12 |
+
FIND_PACKAGE(RSVG)
|
13 |
+
FIND_PACKAGE(GtkGl)
|
14 |
+
@@ -775,6 +773,10 @@ ELSE()
|
15 |
+
FIND_PACKAGE(Lua51)
|
16 |
+
ENDIF()
|
17 |
+
ENDIF()
|
18 |
+
+
|
19 |
+
+ find_package(SDL)
|
20 |
+
+ find_package(SDL2 CONFIG)
|
21 |
+
+ set(SDL2_LIBRARY SDL2::SDL2 SDL2::SDL2main)
|
22 |
+
|
23 |
+
# V8 and Python plugins are tests for linking against these libraries but aren't functionality beyond this.
|
24 |
+
# FIND_PACKAGE(V8)
|
25 |
+
diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp
|
26 |
+
index 9de15b1..ae96e11 100644
|
27 |
+
--- a/examples/osgmovie/osgmovie.cpp
|
28 |
+
+++ b/examples/osgmovie/osgmovie.cpp
|
29 |
+
@@ -691,7 +691,7 @@ int main(int argc, char** argv)
|
30 |
+
|
31 |
+
#if USE_SDL || USE_SDL2
|
32 |
+
|
33 |
+
-#include "SDL.h"
|
34 |
+
+#include <SDL/SDL.h>
|
35 |
+
|
36 |
+
static void soundReadCallback(void * user_data, uint8_t * data, int datalen)
|
37 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/osgdb_zip_nozip.patch
ADDED
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From bee432e701c541f9a86bd051b795c3e056e36646 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Ankur Verma <[email protected]>
|
3 |
+
Date: Sun, 16 Aug 2020 14:36:31 -0700
|
4 |
+
Subject: [PATCH] osg
|
5 |
+
|
6 |
+
---
|
7 |
+
src/osgPlugins/zip/unzip.cpp | 4 ++--
|
8 |
+
1 file changed, 2 insertions(+), 2 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp
|
11 |
+
index 0bec28f0c..74e7b2413 100644
|
12 |
+
--- a/src/osgPlugins/zip/unzip.cpp
|
13 |
+
+++ b/src/osgPlugins/zip/unzip.cpp
|
14 |
+
@@ -1742,8 +1742,8 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
|
15 |
+
|
16 |
+
|
17 |
+
|
18 |
+
-extern const char inflate_copyright[] =
|
19 |
+
- " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
|
20 |
+
+//extern const char inflate_copyright[] =
|
21 |
+
+// " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
|
22 |
+
// If you use the zlib library in a product, an acknowledgment is welcome
|
23 |
+
// in the documentation of your product. If for some reason you cannot
|
24 |
+
// include such an acknowledgment, I would appreciate that you keep this
|
25 |
+
--
|
26 |
+
2.26.2
|
27 |
+
|
28 |
+
From 24d4036036884b350bd6c519b64626faa2c7e660 Mon Sep 17 00:00:00 2001
|
29 |
+
From: Ankur Verma <[email protected]>
|
30 |
+
Date: Thu, 20 Aug 2020 23:16:12 -0700
|
31 |
+
Subject: [PATCH] Symbol clashes
|
32 |
+
|
33 |
+
---
|
34 |
+
src/osgPlugins/zip/unzip.cpp | 2 +-
|
35 |
+
1 file changed, 1 insertion(+), 1 deletion(-)
|
36 |
+
|
37 |
+
diff --git a/src/osgPlugins/zip/unzip.cpp b/src/osgPlugins/zip/unzip.cpp
|
38 |
+
index 74e7b2413..f5169c6f4 100644
|
39 |
+
--- a/src/osgPlugins/zip/unzip.cpp
|
40 |
+
+++ b/src/osgPlugins/zip/unzip.cpp
|
41 |
+
@@ -213,7 +213,7 @@ DWORD GetFilePosU(HANDLE hfout)
|
42 |
+
return ftell(hfout);
|
43 |
+
}
|
44 |
+
|
45 |
+
-bool FileExists(const TCHAR *fn)
|
46 |
+
+static bool FileExists(const TCHAR *fn)
|
47 |
+
{ struct stat st;
|
48 |
+
int res=stat(fn,&st);
|
49 |
+
return (res==0);
|
50 |
+
--
|
51 |
+
2.26.2
|
52 |
+
|