Spaces:
Sleeping
Sleeping
dec76b893d647d1dab33014ca5d1e88d7030d337abb75a4cf6f837c0451d13a5
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/uwp.patch +50 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/vcpkg.json +49 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/fix-install-prefix-path.patch +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/fix-pdb-find.patch +33 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/install-include-dir.patch +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/portfile.cmake +108 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/vcpkg.json +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencc/portfile.cmake +51 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencc/vcpkg.json +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/fix-install.patch +204 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/portfile.cmake +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/vcpkg.json +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/0001-include-unistd-for-gete-ug-id.patch +27 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/portfile.cmake +105 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/usage +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/fix-buildTools.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/fix-dependency.patch +117 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/portfile.cmake +64 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/vcpkg.json +32 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/CMakeLists.txt +46 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/illegal_char.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/portfile.cmake +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv/portfile.cmake +1 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv/vcpkg.json +414 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0002-install-options.patch +344 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0003-force-package-requirements.patch +56 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0004-add-ffmpeg-missing-defines.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0005-fix-cuda.patch +140 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/fix-path-contains-++-error.patch +49 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/portfile.cmake +203 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/vcpkg.json +132 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0001-disable-downloading.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0002-install-options.patch +59 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0003-force-package-requirements.patch +83 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0004-fix-eigen.patch +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0005-fix-vtk9.patch +466 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0006-fix-uwp.patch +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0007-fix-hdf5.patch +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0008-devendor-quirc.patch +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0009-fix-protobuf.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0011-remove-python2.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0012-fix-zlib.patch +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/portfile.cmake +535 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/vcpkg.json +268 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv4/0001-disable-downloading.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv4/0002-install-options.patch +57 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/uwp.patch
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
2 |
+
--- a/cmake/prebuild.cmake 2019-01-28 03:05:58.422245700 -0600
|
3 |
+
+++ b/cmake/prebuild.cmake 2019-01-28 03:07:02.885495800 -0600
|
4 |
+
@@ -37,6 +37,9 @@
|
5 |
+
|
6 |
+
# CPUIDEMU = ../../cpuid/table.o
|
7 |
+
|
8 |
+
+if (NOT DEFINED BLASHELPER_BINARY_DIR)
|
9 |
+
+ set(BLASHELPER_BINARY_DIR "${PROJECT_BINARY_DIR}")
|
10 |
+
+endif ()
|
11 |
+
|
12 |
+
if (DEFINED CPUIDEMU)
|
13 |
+
set(EXFLAGS "-DCPUIDEMU -DVENDOR=99")
|
14 |
+
@@ -310,8 +313,8 @@ else(NOT CMAKE_CROSSCOMPILING)
|
15 |
+
message(STATUS "Running getarch")
|
16 |
+
|
17 |
+
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
18 |
+
-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
19 |
+
-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
20 |
+
+execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT)
|
21 |
+
+execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT)
|
22 |
+
|
23 |
+
message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}")
|
24 |
+
|
25 |
+
@@ -337,8 +340,8 @@ execute_process(COMMAND "${PROJECT_BINAR
|
26 |
+
endif ()
|
27 |
+
|
28 |
+
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
29 |
+
-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
30 |
+
-execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
31 |
+
+execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT)
|
32 |
+
+execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT)
|
33 |
+
|
34 |
+
# append config data from getarch_2nd to the TARGET file and read in CMake vars
|
35 |
+
file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
|
36 |
+
|
37 |
+
diff --git a/cmake/system.cmake b/cmake/system.cmake
|
38 |
+
index a060d98..52ffa5a 100644
|
39 |
+
--- a/cmake/system.cmake
|
40 |
+
+++ b/cmake/system.cmake
|
41 |
+
@@ -13,6 +13,9 @@ if(CMAKE_CROSSCOMPILING AND NOT DEFINED TARGET)
|
42 |
+
set(TARGET "ARMV8")
|
43 |
+
elseif(ARM)
|
44 |
+
set(TARGET "ARMV7") # TODO: Ask compiler which arch this is
|
45 |
+
+ elseif(${HOST_OS} STREQUAL "WINDOWSSTORE")
|
46 |
+
+ set(CMAKE_CROSSCOMPILING 0)
|
47 |
+
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
|
48 |
+
else()
|
49 |
+
message(FATAL_ERROR "When cross compiling, a TARGET is required.")
|
50 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/vcpkg.json
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openblas",
|
3 |
+
"version": "0.3.19",
|
4 |
+
"description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
|
5 |
+
"homepage": "https://github.com/xianyi/OpenBLAS",
|
6 |
+
"dependencies": [
|
7 |
+
{
|
8 |
+
"name": "openblas",
|
9 |
+
"host": true
|
10 |
+
},
|
11 |
+
{
|
12 |
+
"name": "pthread",
|
13 |
+
"platform": "!windows & !uwp"
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake-config",
|
21 |
+
"host": true
|
22 |
+
}
|
23 |
+
],
|
24 |
+
"features": {
|
25 |
+
"dynamic-arch": {
|
26 |
+
"description": "Support for multiple targets in a single library"
|
27 |
+
},
|
28 |
+
"simplethread": {
|
29 |
+
"description": "Use simple thread",
|
30 |
+
"dependencies": [
|
31 |
+
{
|
32 |
+
"name": "openblas",
|
33 |
+
"features": [
|
34 |
+
"threads"
|
35 |
+
]
|
36 |
+
}
|
37 |
+
]
|
38 |
+
},
|
39 |
+
"threads": {
|
40 |
+
"description": "Use a threading backend",
|
41 |
+
"dependencies": [
|
42 |
+
{
|
43 |
+
"name": "pthread",
|
44 |
+
"platform": "!windows & !uwp"
|
45 |
+
}
|
46 |
+
]
|
47 |
+
}
|
48 |
+
}
|
49 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/fix-install-prefix-path.patch
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
|
2 |
+
index e391ddf..c926c49 100644
|
3 |
+
--- a/adm/templates/OpenCASCADEConfig.cmake.in
|
4 |
+
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
|
5 |
+
@@ -24,6 +24,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
|
6 |
+
# - in Android style: $INSTALL_DIR/libs/$CMAKE_ANDROID_ARCH_ABI/cmake/opencascade-<version>
|
7 |
+
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
8 |
+
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
9 |
+
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
10 |
+
if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
|
11 |
+
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
|
12 |
+
endif()
|
13 |
+
--
|
14 |
+
2.14.3.windows.1
|
15 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/fix-pdb-find.patch
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
|
2 |
+
index a63f3ce..aa77c20 100644
|
3 |
+
--- a/adm/cmake/cotire.cmake
|
4 |
+
+++ b/adm/cmake/cotire.cmake
|
5 |
+
@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
|
6 |
+
OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
|
7 |
+
IOS_INSTALL_COMBINED)
|
8 |
+
# copy Windows platform specific stuff
|
9 |
+
+ if (BUILD_SHARED_LIBS)
|
10 |
+
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
|
11 |
+
GNUtoMS
|
12 |
+
COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
|
13 |
+
@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
|
14 |
+
WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
|
15 |
+
DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
|
16 |
+
VS_SDK_REFERENCES)
|
17 |
+
+ endif()
|
18 |
+
# copy Android platform specific stuff
|
19 |
+
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
|
20 |
+
ANDROID_API ANDROID_API_MIN ANDROID_GUI
|
21 |
+
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
|
22 |
+
index 2f96c6f..78f15f0 100644
|
23 |
+
--- a/adm/cmake/occt_toolkit.cmake
|
24 |
+
+++ b/adm/cmake/occt_toolkit.cmake
|
25 |
+
@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT)
|
26 |
+
else()
|
27 |
+
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
|
28 |
+
|
29 |
+
- if (MSVC)
|
30 |
+
+ if (MSVC AND BUILD_SHARED_LIBS)
|
31 |
+
if (BUILD_FORCE_RelWithDebInfo)
|
32 |
+
set (aReleasePdbConf "Release")
|
33 |
+
else()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/install-include-dir.patch
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 32c4bdd88555309752215c53842d438cb51bcb62 Mon Sep 17 00:00:00 2001
|
2 |
+
From: bloess <[email protected]>
|
3 |
+
Date: Mon, 15 Feb 2021 16:26:36 +0100
|
4 |
+
Subject: [PATCH] install include-dir
|
5 |
+
|
6 |
+
---
|
7 |
+
CMakeLists.txt | 9 +++++++++
|
8 |
+
1 file changed, 9 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
11 |
+
index 100d613..464f95a 100644
|
12 |
+
--- a/CMakeLists.txt
|
13 |
+
+++ b/CMakeLists.txt
|
14 |
+
@@ -1171,6 +1171,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES})
|
15 |
+
endforeach()
|
16 |
+
set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED})
|
17 |
+
|
18 |
+
+foreach (OCCT_LIBRARY ${OCCT_LIBRARIES})
|
19 |
+
+ target_include_directories(
|
20 |
+
+ ${OCCT_LIBRARY}
|
21 |
+
+ INTERFACE
|
22 |
+
+ $<INSTALL_INTERFACE:include>)
|
23 |
+
+
|
24 |
+
+endforeach()
|
25 |
+
+
|
26 |
+
# Add all targets to the build-tree export set
|
27 |
+
export (TARGETS ${OCCT_LIBRARIES} FILE "${CMAKE_BINARY_DIR}/OpenCASCADETargets.cmake")
|
28 |
+
|
29 |
+
--
|
30 |
+
2.14.3.windows.1
|
31 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/portfile.cmake
ADDED
@@ -0,0 +1,108 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO Open-Cascade-SAS/OCCT
|
4 |
+
REF 80ffc5f84dae96de6ed093d3e5d2466a9e368b27 #V7.6.0
|
5 |
+
SHA512 1dfee9c59eb6ea61735f0807d44ccf62019a2649f506a5a8197e04b1533592dc95d6d67ab7a3bb392785755ed60b6fc489bea049f658d4ae7d05dfe0d7d5bdcd
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
fix-pdb-find.patch
|
9 |
+
fix-install-prefix-path.patch
|
10 |
+
install-include-dir.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
14 |
+
set(BUILD_TYPE "Shared")
|
15 |
+
else()
|
16 |
+
set(BUILD_TYPE "Static")
|
17 |
+
endif()
|
18 |
+
|
19 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
20 |
+
FEATURES
|
21 |
+
"freeimage" USE_FREEIMAGE
|
22 |
+
"tbb" USE_TBB
|
23 |
+
"rapidjson" USE_RAPIDJSON
|
24 |
+
)
|
25 |
+
|
26 |
+
# VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0
|
27 |
+
|
28 |
+
# We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0
|
29 |
+
# And pre-built ActiveTCL binaries are behind a marketing wall :(
|
30 |
+
# We use the Unix install layout for Windows as it matches vcpkg
|
31 |
+
vcpkg_cmake_configure(
|
32 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
33 |
+
OPTIONS
|
34 |
+
${FEATURE_OPTIONS}
|
35 |
+
-DBUILD_LIBRARY_TYPE=${BUILD_TYPE}
|
36 |
+
-DBUILD_MODULE_Draw=OFF
|
37 |
+
-DINSTALL_DIR_LAYOUT=Unix
|
38 |
+
-DBUILD_SAMPLES_MFC=OFF
|
39 |
+
-DBUILD_SAMPLES_QT=OFF
|
40 |
+
-DBUILD_DOC_Overview=OFF
|
41 |
+
-DINSTALL_TEST_CASES=OFF
|
42 |
+
-DINSTALL_SAMPLES=OFF
|
43 |
+
)
|
44 |
+
|
45 |
+
vcpkg_cmake_install()
|
46 |
+
|
47 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade)
|
48 |
+
|
49 |
+
#make occt includes relative to source_file
|
50 |
+
list(APPEND ADDITIONAL_HEADERS
|
51 |
+
"ExprIntrp.tab.h"
|
52 |
+
"FlexLexer.h"
|
53 |
+
"glext.h"
|
54 |
+
"igesread.h"
|
55 |
+
"NCollection_Haft.h"
|
56 |
+
"OSD_PerfMeter.h"
|
57 |
+
"Standard_values.h"
|
58 |
+
)
|
59 |
+
|
60 |
+
file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx")
|
61 |
+
foreach(file_name IN LISTS files)
|
62 |
+
file(READ "${file_name}" filedata)
|
63 |
+
string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}")
|
64 |
+
foreach(extra_header IN LISTS ADDITIONAL_HEADERS)
|
65 |
+
string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}")
|
66 |
+
endforeach()
|
67 |
+
file(WRITE "${file_name}" "${filedata}")
|
68 |
+
endforeach()
|
69 |
+
|
70 |
+
# Remove libd to lib, libd just has cmake files we dont want too
|
71 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
|
72 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib")
|
73 |
+
|
74 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
75 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
76 |
+
|
77 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
78 |
+
# debug creates libd and bind directories that need moving
|
79 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
80 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
81 |
+
|
82 |
+
# fix paths in target files
|
83 |
+
list(APPEND TARGET_FILES
|
84 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake"
|
85 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake"
|
86 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake"
|
87 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake"
|
88 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake"
|
89 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake"
|
90 |
+
"${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake"
|
91 |
+
)
|
92 |
+
|
93 |
+
foreach(TARGET_FILE IN LISTS TARGET_FILES)
|
94 |
+
file(READ "${TARGET_FILE}" filedata)
|
95 |
+
string(REGEX REPLACE "libd" "lib" filedata "${filedata}")
|
96 |
+
string(REGEX REPLACE "bind" "bin" filedata "${filedata}")
|
97 |
+
file(WRITE "${TARGET_FILE}" "${filedata}")
|
98 |
+
endforeach()
|
99 |
+
|
100 |
+
# the bin directory ends up with bat files that are noise, let's clean that up
|
101 |
+
file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat")
|
102 |
+
file(REMOVE_RECURSE ${BATS})
|
103 |
+
else()
|
104 |
+
# remove scripts in bin dir
|
105 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
106 |
+
endif()
|
107 |
+
|
108 |
+
file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencascade/vcpkg.json
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencascade",
|
3 |
+
"version": "7.6.0",
|
4 |
+
"description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
|
5 |
+
"homepage": "https://github.com/Open-Cascade-SAS/OCCT",
|
6 |
+
"supports": "!(uwp | osx | linux | arm)",
|
7 |
+
"dependencies": [
|
8 |
+
"freetype",
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
],
|
18 |
+
"features": {
|
19 |
+
"freeimage": {
|
20 |
+
"description": "Enable optional usage of freeimage",
|
21 |
+
"dependencies": [
|
22 |
+
"freeimage"
|
23 |
+
]
|
24 |
+
},
|
25 |
+
"rapidjson": {
|
26 |
+
"description": "Enable optional usage of rapidjson",
|
27 |
+
"dependencies": [
|
28 |
+
"rapidjson"
|
29 |
+
]
|
30 |
+
},
|
31 |
+
"tbb": {
|
32 |
+
"description": "Enable optional usage of tbb",
|
33 |
+
"dependencies": [
|
34 |
+
"tbb"
|
35 |
+
]
|
36 |
+
}
|
37 |
+
}
|
38 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencc/portfile.cmake
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO BYVoid/OpenCC
|
4 |
+
REF e8ec6d59f264a4a42e310148a9534a8cc0123928
|
5 |
+
SHA512 e6b3f6d681223b299795c324a48e82609abd1f411d3cbd5f9d8607284ec04717fa9878953d037c25a931a0857f50a5c0e883e0d44ddbea18c50830ad49514c59
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_find_acquire_program(PYTHON3)
|
10 |
+
get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
|
11 |
+
vcpkg_add_to_path(${PYTHON3_DIR})
|
12 |
+
|
13 |
+
vcpkg_configure_cmake(
|
14 |
+
SOURCE_PATH ${SOURCE_PATH}
|
15 |
+
OPTIONS
|
16 |
+
-DBUILD_DOCUMENTATION=OFF
|
17 |
+
-DENABLE_GTEST=OFF
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_install_cmake(
|
21 |
+
DISABLE_PARALLEL
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_copy_pdbs()
|
25 |
+
|
26 |
+
if(tools IN_LIST FEATURES)
|
27 |
+
foreach(opencc_tool opencc opencc_dict opencc_phrase_extract)
|
28 |
+
file(COPY
|
29 |
+
${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}
|
30 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}
|
31 |
+
)
|
32 |
+
endforeach()
|
33 |
+
|
34 |
+
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
35 |
+
endif()
|
36 |
+
|
37 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
38 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
39 |
+
else()
|
40 |
+
foreach(opencc_tool opencc opencc_dict opencc_phrase_extract)
|
41 |
+
file(REMOVE
|
42 |
+
${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}
|
43 |
+
${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}
|
44 |
+
)
|
45 |
+
endforeach()
|
46 |
+
endif()
|
47 |
+
|
48 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
49 |
+
|
50 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
51 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencc/vcpkg.json
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencc",
|
3 |
+
"version-date": "2020-04-26",
|
4 |
+
"port-version": 10,
|
5 |
+
"description": "A project for conversion between Traditional and Simplified Chinese",
|
6 |
+
"homepage": "https://github.com/BYVoid/OpenCC",
|
7 |
+
"supports": "!(arm | uwp)",
|
8 |
+
"features": {
|
9 |
+
"tools": {
|
10 |
+
"description": "Build OpenCC command-line tools"
|
11 |
+
}
|
12 |
+
}
|
13 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/fix-install.patch
ADDED
@@ -0,0 +1,204 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake
|
2 |
+
index 8fdfe96..53bc877 100644
|
3 |
+
--- a/cmake/OpenCensusHelpers.cmake
|
4 |
+
+++ b/cmake/OpenCensusHelpers.cmake
|
5 |
+
@@ -37,6 +37,13 @@ function(opencensus_test NAME SRC)
|
6 |
+
prepend_opencensus(DEPS "${ARGN}")
|
7 |
+
target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main)
|
8 |
+
add_test(NAME ${_NAME} COMMAND ${_NAME})
|
9 |
+
+
|
10 |
+
+ install(
|
11 |
+
+ TARGETS ${_NAME}
|
12 |
+
+ RUNTIME DESTINATION tools
|
13 |
+
+ LIBRARY DESTINATION lib
|
14 |
+
+ ARCHIVE DESTINATION lib
|
15 |
+
+ )
|
16 |
+
endif()
|
17 |
+
endfunction()
|
18 |
+
|
19 |
+
@@ -50,6 +57,13 @@ function(opencensus_benchmark NAME SRC)
|
20 |
+
add_executable(${_NAME} ${SRC})
|
21 |
+
prepend_opencensus(DEPS "${ARGN}")
|
22 |
+
target_link_libraries(${_NAME} "${DEPS}" benchmark)
|
23 |
+
+
|
24 |
+
+ install(
|
25 |
+
+ TARGETS ${_NAME}
|
26 |
+
+ RUNTIME DESTINATION tools
|
27 |
+
+ LIBRARY DESTINATION lib
|
28 |
+
+ ARCHIVE DESTINATION lib
|
29 |
+
+ )
|
30 |
+
endif()
|
31 |
+
endfunction()
|
32 |
+
|
33 |
+
@@ -71,6 +85,12 @@ function(opencensus_lib NAME)
|
34 |
+
if(ARG_PUBLIC)
|
35 |
+
add_library(${PROJECT_NAME}::${NAME} ALIAS ${_NAME})
|
36 |
+
endif()
|
37 |
+
+ install(
|
38 |
+
+ TARGETS ${_NAME}
|
39 |
+
+ RUNTIME DESTINATION bin
|
40 |
+
+ LIBRARY DESTINATION lib
|
41 |
+
+ ARCHIVE DESTINATION lib
|
42 |
+
+ )
|
43 |
+
endfunction()
|
44 |
+
|
45 |
+
# Helper function for fuzzing. Usage:
|
46 |
+
@@ -83,5 +103,12 @@ function(opencensus_fuzzer NAME SRC)
|
47 |
+
prepend_opencensus(DEPS "${ARGN}")
|
48 |
+
target_link_libraries(${_NAME} "${DEPS}" ${FUZZER})
|
49 |
+
target_compile_options(${_NAME} PRIVATE ${FUZZER})
|
50 |
+
+
|
51 |
+
+ install(
|
52 |
+
+ TARGETS ${_NAME}
|
53 |
+
+ RUNTIME DESTINATION tools
|
54 |
+
+ LIBRARY DESTINATION lib
|
55 |
+
+ ARCHIVE DESTINATION lib
|
56 |
+
+ )
|
57 |
+
endif()
|
58 |
+
endfunction()
|
59 |
+
diff --git a/examples/helloworld/CMakeLists.txt b/examples/helloworld/CMakeLists.txt
|
60 |
+
index 86cc1f4..cbbcb29 100644
|
61 |
+
--- a/examples/helloworld/CMakeLists.txt
|
62 |
+
+++ b/examples/helloworld/CMakeLists.txt
|
63 |
+
@@ -23,3 +23,10 @@ target_link_libraries(
|
64 |
+
opencensus-cpp::stats
|
65 |
+
opencensus-cpp::trace
|
66 |
+
Threads::Threads)
|
67 |
+
+
|
68 |
+
+install(
|
69 |
+
+ TARGETS opencensus_examples_helloworld
|
70 |
+
+ RUNTIME DESTINATION tools
|
71 |
+
+ LIBRARY DESTINATION lib
|
72 |
+
+ ARCHIVE DESTINATION lib
|
73 |
+
+)
|
74 |
+
diff --git a/opencensus/common/internal/CMakeLists.txt b/opencensus/common/internal/CMakeLists.txt
|
75 |
+
index a9dbd87..810a8c8 100644
|
76 |
+
--- a/opencensus/common/internal/CMakeLists.txt
|
77 |
+
+++ b/opencensus/common/internal/CMakeLists.txt
|
78 |
+
@@ -23,6 +23,12 @@ opencensus_lib(
|
79 |
+
absl::synchronization
|
80 |
+
absl::time)
|
81 |
+
|
82 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
83 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal)
|
84 |
+
+
|
85 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/grpc/*.h)
|
86 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/common/internal/grpc)
|
87 |
+
+
|
88 |
+
opencensus_lib(common_stats_object DEPS absl::time)
|
89 |
+
|
90 |
+
# Define NOMINMAX to fix build errors when compiling with MSVC.
|
91 |
+
diff --git a/opencensus/context/CMakeLists.txt b/opencensus/context/CMakeLists.txt
|
92 |
+
index 149958c..2474a66 100644
|
93 |
+
--- a/opencensus/context/CMakeLists.txt
|
94 |
+
+++ b/opencensus/context/CMakeLists.txt
|
95 |
+
@@ -22,6 +22,9 @@ opencensus_lib(
|
96 |
+
tags
|
97 |
+
trace)
|
98 |
+
|
99 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
100 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/context)
|
101 |
+
+
|
102 |
+
opencensus_test(
|
103 |
+
context_context_test
|
104 |
+
internal/context_test.cc
|
105 |
+
diff --git a/opencensus/exporters/stats/prometheus/CMakeLists.txt b/opencensus/exporters/stats/prometheus/CMakeLists.txt
|
106 |
+
index 01038cc..0ad712b 100644
|
107 |
+
--- a/opencensus/exporters/stats/prometheus/CMakeLists.txt
|
108 |
+
+++ b/opencensus/exporters/stats/prometheus/CMakeLists.txt
|
109 |
+
@@ -21,6 +21,12 @@ opencensus_lib(
|
110 |
+
exporters_stats_prometheus_utils
|
111 |
+
stats)
|
112 |
+
|
113 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
114 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus)
|
115 |
+
+
|
116 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h)
|
117 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/prometheus/internal)
|
118 |
+
+
|
119 |
+
opencensus_lib(
|
120 |
+
exporters_stats_prometheus_utils
|
121 |
+
SRCS
|
122 |
+
diff --git a/opencensus/exporters/stats/stdout/CMakeLists.txt b/opencensus/exporters/stats/stdout/CMakeLists.txt
|
123 |
+
index 5278e65..2930817 100644
|
124 |
+
--- a/opencensus/exporters/stats/stdout/CMakeLists.txt
|
125 |
+
+++ b/opencensus/exporters/stats/stdout/CMakeLists.txt
|
126 |
+
@@ -23,5 +23,8 @@ opencensus_lib(
|
127 |
+
absl::strings
|
128 |
+
absl::time)
|
129 |
+
|
130 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
131 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/stats/stdout)
|
132 |
+
+
|
133 |
+
opencensus_test(exporters_stats_stdout_test internal/stdout_exporter_test.cc
|
134 |
+
exporters_stats_stdout stats stats_test_utils absl::time)
|
135 |
+
diff --git a/opencensus/exporters/trace/stdout/CMakeLists.txt b/opencensus/exporters/trace/stdout/CMakeLists.txt
|
136 |
+
index c7c580f..d9befa1 100644
|
137 |
+
--- a/opencensus/exporters/trace/stdout/CMakeLists.txt
|
138 |
+
+++ b/opencensus/exporters/trace/stdout/CMakeLists.txt
|
139 |
+
@@ -22,5 +22,8 @@ opencensus_lib(
|
140 |
+
absl::base
|
141 |
+
absl::memory)
|
142 |
+
|
143 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
144 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/exporters/trace/stdout)
|
145 |
+
+
|
146 |
+
opencensus_test(exporters_trace_stdout_test internal/stdout_exporter_test.cc
|
147 |
+
exporters_trace_stdout trace absl::time)
|
148 |
+
diff --git a/opencensus/stats/CMakeLists.txt b/opencensus/stats/CMakeLists.txt
|
149 |
+
index 9b0d7af..a8a9d50 100644
|
150 |
+
--- a/opencensus/stats/CMakeLists.txt
|
151 |
+
+++ b/opencensus/stats/CMakeLists.txt
|
152 |
+
@@ -71,6 +71,12 @@ opencensus_lib(
|
153 |
+
absl::strings
|
154 |
+
absl::time)
|
155 |
+
|
156 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
157 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats)
|
158 |
+
+
|
159 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h)
|
160 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/stats/internal)
|
161 |
+
+
|
162 |
+
# ----------------------------------------------------------------------
|
163 |
+
# Tests
|
164 |
+
# ----------------------------------------------------------------------
|
165 |
+
diff --git a/opencensus/tags/CMakeLists.txt b/opencensus/tags/CMakeLists.txt
|
166 |
+
index 7219a2a..97a0de1 100644
|
167 |
+
--- a/opencensus/tags/CMakeLists.txt
|
168 |
+
+++ b/opencensus/tags/CMakeLists.txt
|
169 |
+
@@ -53,6 +53,12 @@ opencensus_lib(
|
170 |
+
context
|
171 |
+
absl::strings)
|
172 |
+
|
173 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
174 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags)
|
175 |
+
+
|
176 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h)
|
177 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/tags/propagation)
|
178 |
+
+
|
179 |
+
opencensus_test(tags_context_util_test internal/context_util_test.cc tags
|
180 |
+
tags_context_util tags_with_tag_map context)
|
181 |
+
|
182 |
+
diff --git a/opencensus/trace/CMakeLists.txt b/opencensus/trace/CMakeLists.txt
|
183 |
+
index 2c4e656..25d7241 100644
|
184 |
+
--- a/opencensus/trace/CMakeLists.txt
|
185 |
+
+++ b/opencensus/trace/CMakeLists.txt
|
186 |
+
@@ -122,6 +122,18 @@ opencensus_lib(
|
187 |
+
trace
|
188 |
+
context)
|
189 |
+
|
190 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/*.h)
|
191 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace)
|
192 |
+
+
|
193 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/exporter/*.h)
|
194 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/exporter)
|
195 |
+
+
|
196 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/internal/*.h)
|
197 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/internal)
|
198 |
+
+
|
199 |
+
+file(GLOB HDRS ${CMAKE_CURRENT_LIST_DIR}/propagation/*.h)
|
200 |
+
+install(FILES ${HDRS} DESTINATION include/opencensus-cpp/opencensus/trace/propagation)
|
201 |
+
+
|
202 |
+
# ----------------------------------------------------------------------
|
203 |
+
# Tests
|
204 |
+
# ----------------------------------------------------------------------
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/portfile.cmake
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO census-instrumentation/opencensus-cpp
|
4 |
+
REF 62d8281899a1cfd1084793f64295329a6b5d22b3 # 2021-08-26
|
5 |
+
SHA512 35df40d7e5ce933384fe6ba4ac2d704e0801ac47765fca97ea3f8d787886abe5c588855c3aac5745f047c1c8f2047e1f69b62340dd702042a61c3dc430ca36b4
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES fix-install.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
11 |
+
FEATURES
|
12 |
+
test BUILD_TESTING
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_cmake_configure(
|
16 |
+
SOURCE_PATH ${SOURCE_PATH}
|
17 |
+
OPTIONS ${FEATURE_OPTIONS}
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_cmake_install()
|
21 |
+
|
22 |
+
vcpkg_copy_pdbs()
|
23 |
+
|
24 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
25 |
+
|
26 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencensus-cpp/vcpkg.json
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencensus-cpp",
|
3 |
+
"version-date": "2021-08-26",
|
4 |
+
"description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.",
|
5 |
+
"homepage": "https://github.com/census-instrumentation/opencensus-cpp",
|
6 |
+
"supports": "!windows",
|
7 |
+
"dependencies": [
|
8 |
+
"abseil",
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
],
|
18 |
+
"features": {
|
19 |
+
"test": {
|
20 |
+
"description": "Build test"
|
21 |
+
}
|
22 |
+
}
|
23 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/0001-include-unistd-for-gete-ug-id.patch
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 0f783f1a8eac7a78bc92198e140d4a5c745382ca Mon Sep 17 00:00:00 2001
|
2 |
+
From: Nicole Mazzuca <[email protected]>
|
3 |
+
Date: Wed, 23 Sep 2020 11:50:21 -0700
|
4 |
+
Subject: [PATCH] include unistd for gete?[ug]id
|
5 |
+
|
6 |
+
---
|
7 |
+
loader/linux/icd_linux_envvars.c | 4 ++++
|
8 |
+
1 file changed, 4 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/loader/linux/icd_linux_envvars.c b/loader/linux/icd_linux_envvars.c
|
11 |
+
index 4af5a08..92b0698 100644
|
12 |
+
--- a/loader/linux/icd_linux_envvars.c
|
13 |
+
+++ b/loader/linux/icd_linux_envvars.c
|
14 |
+
@@ -25,6 +25,10 @@
|
15 |
+
|
16 |
+
#include <stdlib.h>
|
17 |
+
|
18 |
+
+#if defined(__APPLE__)
|
19 |
+
+#include <unistd.h>
|
20 |
+
+#endif
|
21 |
+
+
|
22 |
+
char *khrIcd_getenv(const char *name) {
|
23 |
+
// No allocation of memory necessary for Linux.
|
24 |
+
return getenv(name);
|
25 |
+
--
|
26 |
+
2.24.3 (Apple Git-128)
|
27 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/portfile.cmake
ADDED
@@ -0,0 +1,105 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO KhronosGroup/OpenCL-Headers
|
4 |
+
REF 0d5f18c6e7196863bc1557a693f1509adfcee056
|
5 |
+
SHA512 7e8fa6c8e73c660d8e9e31ddea3bfef887ed827fc21a1da559bde9dd4af6c52a91f609401bb718528b5c96d21e4c01aee7b8027bdf3dec4b0aa326270788a4b0
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
file(INSTALL "${SOURCE_PATH}/CL" DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
10 |
+
|
11 |
+
# OpenCL C++ headers
|
12 |
+
vcpkg_from_github(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
REPO KhronosGroup/OpenCL-CLHPP
|
15 |
+
REF d62a02090625655e5b2d791d6a58618b043c989c
|
16 |
+
SHA512 837bbe914931d2f18a468f21634dbd4d088eda0a2f22eea23304c0323b9ee064c3ee76db7ebf28ba67fbe07c44129241f8dca62512d89bc7a6b35c2b4b316ed7
|
17 |
+
HEAD_REF master
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_find_acquire_program(PYTHON3)
|
21 |
+
|
22 |
+
vcpkg_execute_required_process(
|
23 |
+
COMMAND "${PYTHON3}" "${SOURCE_PATH}/gen_cl_hpp.py"
|
24 |
+
-i ${SOURCE_PATH}/input_cl.hpp
|
25 |
+
-o ${CURRENT_PACKAGES_DIR}/include/CL/cl.hpp
|
26 |
+
WORKING_DIRECTORY ${SOURCE_PATH}
|
27 |
+
LOGNAME generate_clhpp-${TARGET_TRIPLET}
|
28 |
+
)
|
29 |
+
|
30 |
+
vcpkg_execute_required_process(
|
31 |
+
COMMAND "${PYTHON3}" "${SOURCE_PATH}/gen_cl_hpp.py"
|
32 |
+
-i ${SOURCE_PATH}/input_cl2.hpp
|
33 |
+
-o ${CURRENT_PACKAGES_DIR}/include/CL/cl2.hpp
|
34 |
+
WORKING_DIRECTORY ${SOURCE_PATH}
|
35 |
+
LOGNAME generate_cl2hpp-${TARGET_TRIPLET}
|
36 |
+
)
|
37 |
+
message(STATUS "Generating OpenCL C++ headers done")
|
38 |
+
|
39 |
+
# OpenCL ICD loader
|
40 |
+
vcpkg_from_github(
|
41 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
42 |
+
REPO KhronosGroup/OpenCL-ICD-Loader
|
43 |
+
REF e6e30ab9c7a61c171cf68d2e7f5c0ce28e2a4eae
|
44 |
+
SHA512 f3563c0a4c094d3795d8386ec0db41189d350ab8136d80ae5de611ee3db87fbb0ab851bad2b33e111eddf135add5dbfef77d96979473ca5a23c036608d443378
|
45 |
+
HEAD_REF master
|
46 |
+
PATCHES
|
47 |
+
0001-include-unistd-for-gete-ug-id.patch
|
48 |
+
)
|
49 |
+
|
50 |
+
string(COMPARE EQUAL ${VCPKG_CRT_LINKAGE} dynamic USE_DYNAMIC_VCXX_RUNTIME)
|
51 |
+
|
52 |
+
vcpkg_configure_cmake(
|
53 |
+
SOURCE_PATH ${SOURCE_PATH}
|
54 |
+
PREFER_NINJA
|
55 |
+
OPTIONS
|
56 |
+
-DOPENCL_ICD_LOADER_HEADERS_DIR=${CURRENT_PACKAGES_DIR}/include
|
57 |
+
-DOPENCL_ICD_LOADER_REQUIRE_WDK=OFF
|
58 |
+
-DUSE_DYNAMIC_VCXX_RUNTIME=${USE_DYNAMIC_VCXX_RUNTIME}
|
59 |
+
)
|
60 |
+
|
61 |
+
vcpkg_build_cmake(TARGET OpenCL)
|
62 |
+
|
63 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
64 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
65 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
66 |
+
endif()
|
67 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
68 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
69 |
+
endif()
|
70 |
+
else()
|
71 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
72 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
73 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
74 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
|
75 |
+
endif()
|
76 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
77 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
78 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
|
79 |
+
endif()
|
80 |
+
elseif(VCPKG_TARGET_IS_LINUX)
|
81 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
82 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
83 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
84 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
85 |
+
endif()
|
86 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
87 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
88 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
89 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.1.2" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
90 |
+
endif()
|
91 |
+
elseif(VCPKG_TARGET_IS_OSX)
|
92 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
93 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
94 |
+
endif()
|
95 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
96 |
+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}OpenCL${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
97 |
+
endif()
|
98 |
+
endif()
|
99 |
+
endif()
|
100 |
+
|
101 |
+
vcpkg_copy_pdbs()
|
102 |
+
|
103 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
104 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
105 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/usage
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package opencl is compatible with built-in CMake targets via CMake v3.6 and prior syntax
|
2 |
+
|
3 |
+
find_package(OpenCL REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE ${OpenCL_LIBRARIES})
|
5 |
+
target_include_directories(main PRIVATE ${OpenCL_INCLUDE_DIRS})
|
6 |
+
|
7 |
+
and the CMake v3.7 and beyond imported target syntax
|
8 |
+
|
9 |
+
find_package(OpenCL REQUIRED)
|
10 |
+
target_link_libraries(main PRIVATE OpenCL::OpenCL)
|
11 |
+
|
12 |
+
This package is only an OpenCL SDK. To actually run OpenCL code you also need to install an implementation.
|
13 |
+
|
14 |
+
WINDOWS: implementations typically ship with the drivers of you CPU/GPU vendors.
|
15 |
+
LINUX: implementations may be installed from your distro's repo or manually. There are too many to count.
|
16 |
+
APPLE: consult your distribution vendor on the state of OpenCL support: https://support.apple.com/en-us/HT202823
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/vcpkg-cmake-wrapper.cmake
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
_find_package(${ARGS})
|
2 |
+
if(NOT BUILD_SHARED_LIBS AND (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"))
|
3 |
+
find_package(Threads REQUIRED)
|
4 |
+
set(OpenCL_Extra_Libs ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
|
5 |
+
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
6 |
+
list(APPEND OpenCL_Extra_Libs cfgmgr32)
|
7 |
+
if($ENV{WindowsSDKVersion} MATCHES "^10")
|
8 |
+
list(APPEND OpenCL_Extra_Libs OneCoreUAP)
|
9 |
+
endif()
|
10 |
+
endif(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
11 |
+
|
12 |
+
if(TARGET OpenCL::OpenCL)
|
13 |
+
set_property(TARGET OpenCL::OpenCL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${OpenCL_Extra_Libs})
|
14 |
+
endif()
|
15 |
+
if(OpenCL_LIBRARIES)
|
16 |
+
list(APPEND OpenCL_LIBRARIES ${OpenCL_Extra_Libs})
|
17 |
+
endif()
|
18 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencl/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencl",
|
3 |
+
"version-string": "2.2",
|
4 |
+
"port-version": 8,
|
5 |
+
"description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL",
|
6 |
+
"homepage": "https://github.com/KhronosGroup/OpenCL-Headers",
|
7 |
+
"supports": "!uwp"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/fix-buildTools.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
|
2 |
+
index b992bbc..804d3c5 100644
|
3 |
+
--- a/src/OpenColorIO/CMakeLists.txt
|
4 |
+
+++ b/src/OpenColorIO/CMakeLists.txt
|
5 |
+
@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS)
|
6 |
+
else()
|
7 |
+
# Only exports selected symbols.
|
8 |
+
target_compile_definitions(OpenColorIO
|
9 |
+
- PUBLIC
|
10 |
+
+ PRIVATE
|
11 |
+
OpenColorIO_EXPORTS
|
12 |
+
)
|
13 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/fix-dependency.patch
ADDED
@@ -0,0 +1,117 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
|
2 |
+
index 8787b87..f953ceb 100644
|
3 |
+
--- a/share/cmake/modules/FindExtPackages.cmake
|
4 |
+
+++ b/share/cmake/modules/FindExtPackages.cmake
|
5 |
+
@@ -26,15 +26,15 @@ set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL
|
6 |
+
|
7 |
+
# expat
|
8 |
+
# https://github.com/libexpat/libexpat
|
9 |
+
-find_package(expat 2.2.8 REQUIRED)
|
10 |
+
+find_package(expat CONFIG REQUIRED)
|
11 |
+
|
12 |
+
# yaml-cpp
|
13 |
+
# https://github.com/jbeder/yaml-cpp
|
14 |
+
-find_package(yaml-cpp 0.6.3 REQUIRED)
|
15 |
+
+find_package(yaml-cpp CONFIG REQUIRED)
|
16 |
+
|
17 |
+
# pystring
|
18 |
+
# https://github.com/imageworks/pystring
|
19 |
+
-find_package(pystring 1.1.3 REQUIRED)
|
20 |
+
+find_package(pystring CONFIG REQUIRED)
|
21 |
+
|
22 |
+
# Half
|
23 |
+
# NOTE: OCIO_USE_IMATH_HALF needs to be an integer for use in utils/Half.h.in
|
24 |
+
@@ -42,7 +42,7 @@ if(NOT OCIO_USE_OPENEXR_HALF)
|
25 |
+
|
26 |
+
# Imath (>=3.0)
|
27 |
+
# https://github.com/AcademySoftwareFoundation/Imath
|
28 |
+
- find_package(Imath 3.1.2 REQUIRED)
|
29 |
+
+ find_package(Imath CONFIG REQUIRED)
|
30 |
+
|
31 |
+
set(OCIO_HALF_LIB Imath::Imath CACHE STRING "Half library target" FORCE)
|
32 |
+
set(OCIO_USE_IMATH_HALF "1" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE)
|
33 |
+
@@ -50,7 +50,7 @@ else()
|
34 |
+
|
35 |
+
# OpenEXR/IlmBase (<=2.5)
|
36 |
+
# https://github.com/AcademySoftwareFoundation/openexr
|
37 |
+
- find_package(Half 2.4.0 REQUIRED)
|
38 |
+
+ find_package(Half CONFIG REQUIRED)
|
39 |
+
|
40 |
+
set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE)
|
41 |
+
set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE)
|
42 |
+
@@ -65,13 +65,13 @@ if(OCIO_BUILD_APPS)
|
43 |
+
|
44 |
+
# lcms2
|
45 |
+
# https://github.com/mm2/Little-CMS
|
46 |
+
- find_package(lcms2 2.2 REQUIRED)
|
47 |
+
+ find_package(lcms2 CONFIG REQUIRED)
|
48 |
+
endif()
|
49 |
+
|
50 |
+
if(OCIO_BUILD_OPENFX)
|
51 |
+
# openfx
|
52 |
+
# https://github.com/ofxa/openfx
|
53 |
+
- find_package(openfx 1.4 REQUIRED)
|
54 |
+
+ find_package(openfx CONFIG REQUIRED)
|
55 |
+
endif()
|
56 |
+
|
57 |
+
if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON)
|
58 |
+
@@ -100,6 +100,6 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS)
|
59 |
+
if(OCIO_BUILD_PYTHON)
|
60 |
+
# pybind11
|
61 |
+
# https://github.com/pybind/pybind11
|
62 |
+
- find_package(pybind11 2.6.1 REQUIRED)
|
63 |
+
+ find_package(pybind11 CONFIG REQUIRED)
|
64 |
+
endif()
|
65 |
+
endif()
|
66 |
+
diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
|
67 |
+
index 034185d..b992bbc 100755
|
68 |
+
--- a/src/OpenColorIO/CMakeLists.txt
|
69 |
+
+++ b/src/OpenColorIO/CMakeLists.txt
|
70 |
+
@@ -226,9 +226,9 @@ target_link_libraries(OpenColorIO
|
71 |
+
expat::expat
|
72 |
+
${OCIO_HALF_LIB}
|
73 |
+
pystring::pystring
|
74 |
+
- sampleicc::sampleicc
|
75 |
+
- utils::from_chars
|
76 |
+
- utils::strings
|
77 |
+
+ "$<BUILD_INTERFACE:sampleicc::sampleicc>"
|
78 |
+
+ "$<BUILD_INTERFACE:utils::from_chars>"
|
79 |
+
+ "$<BUILD_INTERFACE:utils::strings>"
|
80 |
+
yaml-cpp
|
81 |
+
)
|
82 |
+
|
83 |
+
@@ -242,13 +242,13 @@ endif()
|
84 |
+
|
85 |
+
if(NOT BUILD_SHARED_LIBS)
|
86 |
+
target_compile_definitions(OpenColorIO
|
87 |
+
- PRIVATE
|
88 |
+
+ PUBLIC
|
89 |
+
OpenColorIO_SKIP_IMPORTS
|
90 |
+
)
|
91 |
+
else()
|
92 |
+
# Only exports selected symbols.
|
93 |
+
target_compile_definitions(OpenColorIO
|
94 |
+
- PRIVATE
|
95 |
+
+ PUBLIC
|
96 |
+
OpenColorIO_EXPORTS
|
97 |
+
)
|
98 |
+
endif()
|
99 |
+
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
|
100 |
+
index eebb2c1..7147dc3 100644
|
101 |
+
--- a/src/cmake/Config.cmake.in
|
102 |
+
+++ b/src/cmake/Config.cmake.in
|
103 |
+
@@ -2,4 +2,14 @@
|
104 |
+
|
105 |
+
include(CMakeFindDependencyMacro)
|
106 |
+
|
107 |
+
+find_dependency(expat CONFIG REQUIRED)
|
108 |
+
+find_dependency(imath CONFIG REQUIRED)
|
109 |
+
+find_dependency(pystring CONFIG REQUIRED)
|
110 |
+
+find_dependency(yaml-cpp CONFIG REQUIRED)
|
111 |
+
+
|
112 |
+
+if(@OCIO_BUILD_APPS@)
|
113 |
+
+ find_dependency(lcms2 CONFIG REQUIRED)
|
114 |
+
+ find_dependency(GLEW)
|
115 |
+
+endif()
|
116 |
+
+
|
117 |
+
include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/portfile.cmake
ADDED
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO AcademySoftwareFoundation/OpenColorIO
|
4 |
+
REF v2.1.1
|
5 |
+
SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
fix-dependency.patch
|
9 |
+
fix-buildTools.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake")
|
13 |
+
file(REMOVE "${SOURCE_PATH}/share/cmake/modules/FindImath.cmake")
|
14 |
+
file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findpystring.cmake")
|
15 |
+
file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findyaml-cpp.cmake")
|
16 |
+
file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake")
|
17 |
+
|
18 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
19 |
+
FEATURES
|
20 |
+
tools OCIO_BUILD_APPS
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_cmake_configure(
|
24 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
25 |
+
OPTIONS
|
26 |
+
-DOCIO_BUILD_NUKE:BOOL=OFF
|
27 |
+
-DOCIO_BUILD_DOCS:BOOL=OFF
|
28 |
+
-DOCIO_BUILD_TESTS:BOOL=OFF
|
29 |
+
-DOCIO_BUILD_GPU_TESTS:BOOL=OFF
|
30 |
+
-DOCIO_BUILD_PYTHON:BOOL=OFF
|
31 |
+
-DOCIO_BUILD_OPENFX:BOOL=OFF
|
32 |
+
-DOCIO_BUILD_JAVA:BOOL=OFF
|
33 |
+
-DOCIO_USE_OPENEXR_HALF:BOOL=OFF
|
34 |
+
-DOCIO_INSTALL_EXT_PACKAGES=NONE
|
35 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On
|
36 |
+
${FEATURE_OPTIONS}
|
37 |
+
)
|
38 |
+
|
39 |
+
vcpkg_cmake_install()
|
40 |
+
|
41 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO")
|
42 |
+
|
43 |
+
vcpkg_copy_pdbs()
|
44 |
+
|
45 |
+
# Clean redundant files
|
46 |
+
file(REMOVE_RECURSE
|
47 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
48 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
49 |
+
"${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake"
|
50 |
+
"${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake"
|
51 |
+
)
|
52 |
+
if(OCIO_BUILD_APPS)
|
53 |
+
vcpkg_copy_tools(
|
54 |
+
TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut
|
55 |
+
AUTO_CLEAN
|
56 |
+
)
|
57 |
+
endif()
|
58 |
+
|
59 |
+
vcpkg_fixup_pkgconfig()
|
60 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
61 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ocio/setup_ocio.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../")
|
62 |
+
endif()
|
63 |
+
|
64 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencolorio/vcpkg.json
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencolorio",
|
3 |
+
"version-semver": "2.1.1",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.",
|
6 |
+
"homepage": "https://opencolorio.org/",
|
7 |
+
"license": "BSD-3-Clause",
|
8 |
+
"supports": "!uwp",
|
9 |
+
"dependencies": [
|
10 |
+
"expat",
|
11 |
+
"imath",
|
12 |
+
"pystring",
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake",
|
15 |
+
"host": true
|
16 |
+
},
|
17 |
+
{
|
18 |
+
"name": "vcpkg-cmake-config",
|
19 |
+
"host": true
|
20 |
+
},
|
21 |
+
"yaml-cpp"
|
22 |
+
],
|
23 |
+
"features": {
|
24 |
+
"tools": {
|
25 |
+
"description": "Installs tools",
|
26 |
+
"dependencies": [
|
27 |
+
"glew",
|
28 |
+
"lcms"
|
29 |
+
]
|
30 |
+
}
|
31 |
+
}
|
32 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/CMakeLists.txt
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required (VERSION 3.4)
|
2 |
+
project (opencsg)
|
3 |
+
|
4 |
+
set(HEADERS
|
5 |
+
include/opencsg.h
|
6 |
+
)
|
7 |
+
|
8 |
+
set(SRCS
|
9 |
+
src/area.cpp
|
10 |
+
src/batch.cpp
|
11 |
+
src/context.cpp
|
12 |
+
src/channelManager.cpp
|
13 |
+
src/frameBufferObject.cpp
|
14 |
+
src/frameBufferObjectExt.cpp
|
15 |
+
src/occlusionQuery.cpp
|
16 |
+
src/opencsgRender.cpp
|
17 |
+
src/openglHelper.cpp
|
18 |
+
src/primitive.cpp
|
19 |
+
src/primitiveHelper.cpp
|
20 |
+
src/renderGoldfeather.cpp
|
21 |
+
src/renderSCS.cpp
|
22 |
+
src/scissorMemo.cpp
|
23 |
+
src/settings.cpp
|
24 |
+
src/stencilManager.cpp
|
25 |
+
src/pBufferTexture.cpp
|
26 |
+
RenderTexture/RenderTexture.cpp
|
27 |
+
)
|
28 |
+
|
29 |
+
|
30 |
+
add_library(opencsg ${SRCS} ${HEADERS})
|
31 |
+
|
32 |
+
include_directories(src include RenderTexture ".")
|
33 |
+
find_package(GLEW REQUIRED)
|
34 |
+
include_directories(${GLEW_INCLUDE_DIRS})
|
35 |
+
target_link_libraries(opencsg PRIVATE GLEW::GLEW)
|
36 |
+
|
37 |
+
install(
|
38 |
+
TARGETS opencsg
|
39 |
+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
40 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
41 |
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
42 |
+
)
|
43 |
+
|
44 |
+
if(NOT DISABLE_INSTALL_HEADERS)
|
45 |
+
install(FILES ${HEADERS} DESTINATION include/opencsg)
|
46 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/illegal_char.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/include/opencsg.h b/include/opencsg.h
|
2 |
+
index d753a0e..b482c40 100644
|
3 |
+
--- a/include/opencsg.h
|
4 |
+
+++ b/include/opencsg.h
|
5 |
+
@@ -156,7 +156,7 @@ namespace OpenCSG {
|
6 |
+
/// The DepthComplexityAlgorithm specifies the strategy for profiting
|
7 |
+
/// from depth complexity when performing the CSG rendering.
|
8 |
+
/// - NoDepthComplexitySampling: Does not employ the depth complexity.
|
9 |
+
- /// This essentially makes the algorithm O(n�), but with
|
10 |
+
+ /// This essentially makes the algorithm O(n²), but with
|
11 |
+
/// low constant costs.
|
12 |
+
/// - DepthComplexitySampling: Calculates the depth complexity k using
|
13 |
+
/// the stencil buffer. This makes algorithm O(n*k), but
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/portfile.cmake
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO floriankirsch/OpenCSG
|
6 |
+
REF "opencsg-1-4-2-release"
|
7 |
+
SHA512 df117a1b7153a95332d236918d1547b0afe6f3ead46af2733c5feee6e25cec984b21affc41fd8320a45be9292bd3b32e21ed8bb3d08371ddd657f659b9bb932a
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES illegal_char.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
13 |
+
|
14 |
+
vcpkg_configure_cmake(
|
15 |
+
SOURCE_PATH ${SOURCE_PATH}
|
16 |
+
PREFER_NINJA
|
17 |
+
OPTIONS -DUNICODE=1 -D_UNICODE=1
|
18 |
+
# OPTIONS_RELEASE -DOPTIMIZE=1
|
19 |
+
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
|
20 |
+
)
|
21 |
+
|
22 |
+
vcpkg_install_cmake()
|
23 |
+
|
24 |
+
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencsg/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencsg",
|
3 |
+
"version-string": "1.4.2",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.",
|
6 |
+
"dependencies": [
|
7 |
+
"glew"
|
8 |
+
]
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv/portfile.cmake
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv/vcpkg.json
ADDED
@@ -0,0 +1,414 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencv",
|
3 |
+
"version": "4.5.5",
|
4 |
+
"description": "Computer vision library",
|
5 |
+
"homepage": "https://github.com/opencv/opencv",
|
6 |
+
"dependencies": [
|
7 |
+
{
|
8 |
+
"name": "opencv4",
|
9 |
+
"default-features": false
|
10 |
+
}
|
11 |
+
],
|
12 |
+
"default-features": [
|
13 |
+
"default-features"
|
14 |
+
],
|
15 |
+
"features": {
|
16 |
+
"ade": {
|
17 |
+
"description": "graph api",
|
18 |
+
"dependencies": [
|
19 |
+
{
|
20 |
+
"name": "opencv4",
|
21 |
+
"default-features": false,
|
22 |
+
"features": [
|
23 |
+
"ade"
|
24 |
+
]
|
25 |
+
}
|
26 |
+
]
|
27 |
+
},
|
28 |
+
"contrib": {
|
29 |
+
"description": "opencv_contrib module",
|
30 |
+
"dependencies": [
|
31 |
+
{
|
32 |
+
"name": "opencv4",
|
33 |
+
"default-features": false,
|
34 |
+
"features": [
|
35 |
+
"contrib"
|
36 |
+
]
|
37 |
+
}
|
38 |
+
]
|
39 |
+
},
|
40 |
+
"cuda": {
|
41 |
+
"description": "CUDA support for opencv",
|
42 |
+
"dependencies": [
|
43 |
+
{
|
44 |
+
"name": "opencv4",
|
45 |
+
"default-features": false,
|
46 |
+
"features": [
|
47 |
+
"cuda"
|
48 |
+
]
|
49 |
+
}
|
50 |
+
]
|
51 |
+
},
|
52 |
+
"cudnn": {
|
53 |
+
"description": "cuDNN support for opencv",
|
54 |
+
"dependencies": [
|
55 |
+
{
|
56 |
+
"name": "opencv4",
|
57 |
+
"default-features": false,
|
58 |
+
"features": [
|
59 |
+
"cudnn"
|
60 |
+
]
|
61 |
+
}
|
62 |
+
]
|
63 |
+
},
|
64 |
+
"default-features": {
|
65 |
+
"description": "Platform-dependent default features",
|
66 |
+
"dependencies": [
|
67 |
+
{
|
68 |
+
"name": "opencv4",
|
69 |
+
"default-features": false,
|
70 |
+
"features": [
|
71 |
+
"dnn",
|
72 |
+
"jpeg",
|
73 |
+
"png",
|
74 |
+
"quirc",
|
75 |
+
"tiff",
|
76 |
+
"webp"
|
77 |
+
]
|
78 |
+
},
|
79 |
+
{
|
80 |
+
"name": "opencv4",
|
81 |
+
"default-features": false,
|
82 |
+
"features": [
|
83 |
+
"gtk"
|
84 |
+
],
|
85 |
+
"platform": "linux"
|
86 |
+
}
|
87 |
+
]
|
88 |
+
},
|
89 |
+
"dnn": {
|
90 |
+
"description": "Enable dnn module",
|
91 |
+
"dependencies": [
|
92 |
+
{
|
93 |
+
"name": "opencv4",
|
94 |
+
"default-features": false,
|
95 |
+
"features": [
|
96 |
+
"dnn"
|
97 |
+
]
|
98 |
+
}
|
99 |
+
]
|
100 |
+
},
|
101 |
+
"eigen": {
|
102 |
+
"description": "Eigen support for opencv",
|
103 |
+
"dependencies": [
|
104 |
+
{
|
105 |
+
"name": "opencv4",
|
106 |
+
"default-features": false,
|
107 |
+
"features": [
|
108 |
+
"eigen"
|
109 |
+
]
|
110 |
+
}
|
111 |
+
]
|
112 |
+
},
|
113 |
+
"ffmpeg": {
|
114 |
+
"description": "ffmpeg support for opencv",
|
115 |
+
"dependencies": [
|
116 |
+
{
|
117 |
+
"name": "opencv4",
|
118 |
+
"default-features": false,
|
119 |
+
"features": [
|
120 |
+
"ffmpeg"
|
121 |
+
]
|
122 |
+
}
|
123 |
+
]
|
124 |
+
},
|
125 |
+
"freetype": {
|
126 |
+
"description": "freetype support for opencv",
|
127 |
+
"dependencies": [
|
128 |
+
{
|
129 |
+
"name": "opencv4",
|
130 |
+
"default-features": false,
|
131 |
+
"features": [
|
132 |
+
"freetype"
|
133 |
+
]
|
134 |
+
}
|
135 |
+
]
|
136 |
+
},
|
137 |
+
"gdcm": {
|
138 |
+
"description": "GDCM support for opencv",
|
139 |
+
"dependencies": [
|
140 |
+
{
|
141 |
+
"name": "opencv4",
|
142 |
+
"default-features": false,
|
143 |
+
"features": [
|
144 |
+
"gdcm"
|
145 |
+
]
|
146 |
+
}
|
147 |
+
]
|
148 |
+
},
|
149 |
+
"gstreamer": {
|
150 |
+
"description": "gstreamer support for opencv",
|
151 |
+
"dependencies": [
|
152 |
+
{
|
153 |
+
"name": "opencv4",
|
154 |
+
"default-features": false,
|
155 |
+
"features": [
|
156 |
+
"gstreamer"
|
157 |
+
]
|
158 |
+
}
|
159 |
+
]
|
160 |
+
},
|
161 |
+
"gtk": {
|
162 |
+
"description": "GTK support for opencv",
|
163 |
+
"dependencies": [
|
164 |
+
{
|
165 |
+
"name": "opencv4",
|
166 |
+
"default-features": false,
|
167 |
+
"features": [
|
168 |
+
"gtk"
|
169 |
+
]
|
170 |
+
}
|
171 |
+
]
|
172 |
+
},
|
173 |
+
"halide": {
|
174 |
+
"description": "Halide support for opencv",
|
175 |
+
"dependencies": [
|
176 |
+
{
|
177 |
+
"name": "opencv4",
|
178 |
+
"default-features": false,
|
179 |
+
"features": [
|
180 |
+
"halide"
|
181 |
+
]
|
182 |
+
}
|
183 |
+
]
|
184 |
+
},
|
185 |
+
"ipp": {
|
186 |
+
"description": "Enable Intel Integrated Performance Primitives",
|
187 |
+
"dependencies": [
|
188 |
+
{
|
189 |
+
"name": "opencv4",
|
190 |
+
"default-features": false,
|
191 |
+
"features": [
|
192 |
+
"ipp"
|
193 |
+
]
|
194 |
+
}
|
195 |
+
]
|
196 |
+
},
|
197 |
+
"jasper": {
|
198 |
+
"description": "JPEG 2000 support for opencv",
|
199 |
+
"dependencies": [
|
200 |
+
{
|
201 |
+
"name": "opencv4",
|
202 |
+
"default-features": false,
|
203 |
+
"features": [
|
204 |
+
"jasper"
|
205 |
+
]
|
206 |
+
}
|
207 |
+
]
|
208 |
+
},
|
209 |
+
"jpeg": {
|
210 |
+
"description": "JPEG support for opencv",
|
211 |
+
"dependencies": [
|
212 |
+
{
|
213 |
+
"name": "opencv4",
|
214 |
+
"default-features": false,
|
215 |
+
"features": [
|
216 |
+
"jpeg"
|
217 |
+
]
|
218 |
+
}
|
219 |
+
]
|
220 |
+
},
|
221 |
+
"lapack": {
|
222 |
+
"description": "LAPACK support for opencv",
|
223 |
+
"dependencies": [
|
224 |
+
{
|
225 |
+
"name": "opencv4",
|
226 |
+
"default-features": false,
|
227 |
+
"features": [
|
228 |
+
"lapack"
|
229 |
+
]
|
230 |
+
}
|
231 |
+
]
|
232 |
+
},
|
233 |
+
"nonfree": {
|
234 |
+
"description": "opencv nonfree module",
|
235 |
+
"dependencies": [
|
236 |
+
{
|
237 |
+
"name": "opencv4",
|
238 |
+
"default-features": false,
|
239 |
+
"features": [
|
240 |
+
"nonfree"
|
241 |
+
]
|
242 |
+
}
|
243 |
+
]
|
244 |
+
},
|
245 |
+
"openexr": {
|
246 |
+
"description": "OpenEXR support for opencv",
|
247 |
+
"dependencies": [
|
248 |
+
{
|
249 |
+
"name": "opencv4",
|
250 |
+
"default-features": false,
|
251 |
+
"features": [
|
252 |
+
"openexr"
|
253 |
+
]
|
254 |
+
}
|
255 |
+
]
|
256 |
+
},
|
257 |
+
"opengl": {
|
258 |
+
"description": "opengl support for opencv",
|
259 |
+
"dependencies": [
|
260 |
+
{
|
261 |
+
"name": "opencv4",
|
262 |
+
"default-features": false,
|
263 |
+
"features": [
|
264 |
+
"opengl"
|
265 |
+
]
|
266 |
+
}
|
267 |
+
]
|
268 |
+
},
|
269 |
+
"openmp": {
|
270 |
+
"description": "Enable openmp support for opencv",
|
271 |
+
"dependencies": [
|
272 |
+
{
|
273 |
+
"name": "opencv4",
|
274 |
+
"default-features": false,
|
275 |
+
"features": [
|
276 |
+
"openmp"
|
277 |
+
]
|
278 |
+
}
|
279 |
+
]
|
280 |
+
},
|
281 |
+
"ovis": {
|
282 |
+
"description": "opencv_ovis module",
|
283 |
+
"dependencies": [
|
284 |
+
{
|
285 |
+
"name": "opencv4",
|
286 |
+
"default-features": false,
|
287 |
+
"features": [
|
288 |
+
"ovis"
|
289 |
+
]
|
290 |
+
}
|
291 |
+
]
|
292 |
+
},
|
293 |
+
"png": {
|
294 |
+
"description": "PNG support for opencv",
|
295 |
+
"dependencies": [
|
296 |
+
{
|
297 |
+
"name": "opencv4",
|
298 |
+
"default-features": false,
|
299 |
+
"features": [
|
300 |
+
"png"
|
301 |
+
]
|
302 |
+
}
|
303 |
+
]
|
304 |
+
},
|
305 |
+
"python": {
|
306 |
+
"description": "Python wrapper support for opencv",
|
307 |
+
"dependencies": [
|
308 |
+
{
|
309 |
+
"name": "opencv4",
|
310 |
+
"default-features": false,
|
311 |
+
"features": [
|
312 |
+
"python"
|
313 |
+
]
|
314 |
+
}
|
315 |
+
]
|
316 |
+
},
|
317 |
+
"qt": {
|
318 |
+
"description": "Qt GUI support for opencv",
|
319 |
+
"dependencies": [
|
320 |
+
{
|
321 |
+
"name": "opencv4",
|
322 |
+
"default-features": false,
|
323 |
+
"features": [
|
324 |
+
"qt"
|
325 |
+
]
|
326 |
+
}
|
327 |
+
]
|
328 |
+
},
|
329 |
+
"quirc": {
|
330 |
+
"description": "Enable QR code module",
|
331 |
+
"dependencies": [
|
332 |
+
{
|
333 |
+
"name": "opencv4",
|
334 |
+
"default-features": false,
|
335 |
+
"features": [
|
336 |
+
"quirc"
|
337 |
+
]
|
338 |
+
}
|
339 |
+
]
|
340 |
+
},
|
341 |
+
"sfm": {
|
342 |
+
"description": "opencv_sfm module",
|
343 |
+
"dependencies": [
|
344 |
+
{
|
345 |
+
"name": "opencv4",
|
346 |
+
"default-features": false,
|
347 |
+
"features": [
|
348 |
+
"sfm"
|
349 |
+
]
|
350 |
+
}
|
351 |
+
]
|
352 |
+
},
|
353 |
+
"tbb": {
|
354 |
+
"description": "Enable Intel Threading Building Blocks",
|
355 |
+
"dependencies": [
|
356 |
+
{
|
357 |
+
"name": "opencv4",
|
358 |
+
"default-features": false,
|
359 |
+
"features": [
|
360 |
+
"tbb"
|
361 |
+
]
|
362 |
+
}
|
363 |
+
]
|
364 |
+
},
|
365 |
+
"tiff": {
|
366 |
+
"description": "TIFF support for opencv",
|
367 |
+
"dependencies": [
|
368 |
+
{
|
369 |
+
"name": "opencv4",
|
370 |
+
"default-features": false,
|
371 |
+
"features": [
|
372 |
+
"tiff"
|
373 |
+
]
|
374 |
+
}
|
375 |
+
]
|
376 |
+
},
|
377 |
+
"vtk": {
|
378 |
+
"description": "vtk support for opencv",
|
379 |
+
"dependencies": [
|
380 |
+
{
|
381 |
+
"name": "opencv4",
|
382 |
+
"default-features": false,
|
383 |
+
"features": [
|
384 |
+
"vtk"
|
385 |
+
]
|
386 |
+
}
|
387 |
+
]
|
388 |
+
},
|
389 |
+
"webp": {
|
390 |
+
"description": "WebP support for opencv",
|
391 |
+
"dependencies": [
|
392 |
+
{
|
393 |
+
"name": "opencv4",
|
394 |
+
"default-features": false,
|
395 |
+
"features": [
|
396 |
+
"webp"
|
397 |
+
]
|
398 |
+
}
|
399 |
+
]
|
400 |
+
},
|
401 |
+
"world": {
|
402 |
+
"description": "Compile to a single package support for opencv",
|
403 |
+
"dependencies": [
|
404 |
+
{
|
405 |
+
"name": "opencv4",
|
406 |
+
"default-features": false,
|
407 |
+
"features": [
|
408 |
+
"world"
|
409 |
+
]
|
410 |
+
}
|
411 |
+
]
|
412 |
+
}
|
413 |
+
}
|
414 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0002-install-options.patch
ADDED
@@ -0,0 +1,344 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/3rdparty/libtiff/CMakeLists.txt
|
2 |
+
+++ b/3rdparty/libtiff/CMakeLists.txt
|
3 |
+
@@ -102,7 +102,7 @@ if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC))
|
4 |
+
endif()
|
5 |
+
|
6 |
+
add_library(${TIFF_LIBRARY} STATIC ${lib_srcs})
|
7 |
+
-target_link_libraries(${TIFF_LIBRARY} ${ZLIB_LIBRARIES})
|
8 |
+
+target_link_libraries(${TIFF_LIBRARY} ZLIB::ZLIB)
|
9 |
+
|
10 |
+
set_target_properties(${TIFF_LIBRARY}
|
11 |
+
PROPERTIES
|
12 |
+
--- a/3rdparty/openexr/CMakeLists.txt
|
13 |
+
+++ b/3rdparty/openexr/CMakeLists.txt
|
14 |
+
@@ -55,7 +55,7 @@ if(MSVC AND CV_ICC)
|
15 |
+
endif()
|
16 |
+
|
17 |
+
add_library(IlmImf STATIC ${lib_hdrs} ${lib_srcs})
|
18 |
+
-target_link_libraries(IlmImf ${ZLIB_LIBRARIES})
|
19 |
+
+target_link_libraries(IlmImf ZLIB::ZLIB)
|
20 |
+
|
21 |
+
set_target_properties(IlmImf
|
22 |
+
PROPERTIES
|
23 |
+
--- a/3rdparty/tbb/CMakeLists.txt
|
24 |
+
+++ b/3rdparty/tbb/CMakeLists.txt
|
25 |
+
@@ -116,7 +116,7 @@ endif()
|
26 |
+
|
27 |
+
if(NOT EXISTS "${tbb_tarball}")
|
28 |
+
message(STATUS "Downloading ${tbb_ver}_src.tgz")
|
29 |
+
- file(DOWNLOAD "${tbb_url}" "${tbb_tarball}" TIMEOUT 600 STATUS __statvar)
|
30 |
+
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${tbb_url}\"\n FILENAME \"${tbb_tarball}\"\n SHA512 0\n )")
|
31 |
+
if(NOT __statvar EQUAL 0)
|
32 |
+
message(FATAL_ERROR "Failed to download TBB sources (${__statvar}): ${tbb_url}")
|
33 |
+
endif()
|
34 |
+
--- a/CMakeLists.txt
|
35 |
+
+++ b/CMakeLists.txt
|
36 |
+
@@ -275,23 +275,10 @@ if (ANDROID)
|
37 |
+
endif()
|
38 |
+
|
39 |
+
if(NOT DEFINED OPENCV_DOC_INSTALL_PATH)
|
40 |
+
- if(ANDROID OR WIN32)
|
41 |
+
- set(OPENCV_DOC_INSTALL_PATH doc)
|
42 |
+
- elseif(INSTALL_TO_MANGLED_PATHS)
|
43 |
+
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
|
44 |
+
- else()
|
45 |
+
- set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
|
46 |
+
- endif()
|
47 |
+
+ set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
|
48 |
+
endif()
|
49 |
+
|
50 |
+
-if(WIN32)
|
51 |
+
- if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
|
52 |
+
- set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
|
53 |
+
- else()
|
54 |
+
- message(STATUS "Can't detect runtime and/or arch")
|
55 |
+
- set(OpenCV_INSTALL_BINARIES_PREFIX "")
|
56 |
+
- endif()
|
57 |
+
-elseif(ANDROID)
|
58 |
+
+if(ANDROID)
|
59 |
+
set(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/")
|
60 |
+
else()
|
61 |
+
set(OpenCV_INSTALL_BINARIES_PREFIX "")
|
62 |
+
@@ -322,29 +309,13 @@ if(ANDROID)
|
63 |
+
set(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include)
|
64 |
+
set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native)
|
65 |
+
else()
|
66 |
+
- set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
|
67 |
+
- set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
|
68 |
+
- if(WIN32)
|
69 |
+
- if(OpenCV_STATIC)
|
70 |
+
- set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
|
71 |
+
- else()
|
72 |
+
- set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
|
73 |
+
- endif()
|
74 |
+
- set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
|
75 |
+
- set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native)
|
76 |
+
- else()
|
77 |
+
- set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
|
78 |
+
- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
|
79 |
+
- set(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
|
80 |
+
- endif()
|
81 |
+
- set(OPENCV_INCLUDE_INSTALL_PATH "include")
|
82 |
+
-
|
83 |
+
- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
|
84 |
+
- if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
|
85 |
+
- set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
|
86 |
+
- else()
|
87 |
+
- set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
|
88 |
+
- endif()
|
89 |
+
+ set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
|
90 |
+
+ set(3P_LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}")
|
91 |
+
+ set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib")
|
92 |
+
+ set(OPENCV_3P_LIB_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}")
|
93 |
+
+ set(OPENCV_SAMPLES_SRC_INSTALL_PATH "share/opencv/samples")
|
94 |
+
+ set(OPENCV_INCLUDE_INSTALL_PATH "include")
|
95 |
+
+ set(OPENCV_CONFIG_INSTALL_PATH "share/opencv")
|
96 |
+
endif()
|
97 |
+
|
98 |
+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")
|
99 |
+
@@ -356,7 +327,7 @@ endif()
|
100 |
+
|
101 |
+
if(WIN32)
|
102 |
+
# Postfix of DLLs:
|
103 |
+
- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
|
104 |
+
+ set(OPENCV_DLLVERSION "")
|
105 |
+
set(OPENCV_DEBUG_POSTFIX d)
|
106 |
+
else()
|
107 |
+
# Postfix of so's:
|
108 |
+
@@ -397,8 +368,6 @@ if(CMAKE_HOST_WIN32)
|
109 |
+
endif()
|
110 |
+
endif()
|
111 |
+
|
112 |
+
-find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
|
113 |
+
-mark_as_advanced(GIT_EXECUTABLE)
|
114 |
+
|
115 |
+
if(GIT_EXECUTABLE)
|
116 |
+
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
|
117 |
+
@@ -501,7 +470,9 @@ if(BUILD_DOCS)
|
118 |
+
endif(BUILD_DOCS)
|
119 |
+
|
120 |
+
# --- Python Support ---
|
121 |
+
-include(cmake/OpenCVDetectPython.cmake)
|
122 |
+
+if(WITH_PYTHON)
|
123 |
+
+ include(cmake/OpenCVDetectPython.cmake)
|
124 |
+
+endif()
|
125 |
+
|
126 |
+
# --- Java Support ---
|
127 |
+
include(cmake/OpenCVDetectApacheAnt.cmake)
|
128 |
+
@@ -885,11 +853,7 @@ if(ANDROID)
|
129 |
+
endif()
|
130 |
+
|
131 |
+
if(DEFINED WITH_FFMPEG OR HAVE_FFMPEG)
|
132 |
+
- if(WIN32)
|
133 |
+
- status(" FFMPEG:" WITH_FFMPEG THEN "YES (prebuilt binaries)" ELSE NO)
|
134 |
+
- else()
|
135 |
+
status(" FFMPEG:" HAVE_FFMPEG THEN YES ELSE NO)
|
136 |
+
- endif()
|
137 |
+
status(" avcodec:" FFMPEG_libavcodec_FOUND THEN "YES (ver ${FFMPEG_libavcodec_VERSION})" ELSE NO)
|
138 |
+
status(" avformat:" FFMPEG_libavformat_FOUND THEN "YES (ver ${FFMPEG_libavformat_VERSION})" ELSE NO)
|
139 |
+
status(" avutil:" FFMPEG_libavutil_FOUND THEN "YES (ver ${FFMPEG_libavutil_VERSION})" ELSE NO)
|
140 |
+
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
|
141 |
+
index e61059a..ec6f34f 100644
|
142 |
+
--- a/cmake/OpenCVCompilerOptions.cmake
|
143 |
+
+++ b/cmake/OpenCVCompilerOptions.cmake
|
144 |
+
@@ -269,7 +269,6 @@ if(MSVC)
|
145 |
+
set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /bigobj")
|
146 |
+
endif()
|
147 |
+
if(BUILD_WITH_DEBUG_INFO)
|
148 |
+
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
|
149 |
+
endif()
|
150 |
+
|
151 |
+
if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:")
|
152 |
+
diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake
|
153 |
+
index 146043f..1202225 100644
|
154 |
+
--- a/cmake/OpenCVFindLibsVideo.cmake
|
155 |
+
+++ b/cmake/OpenCVFindLibsVideo.cmake
|
156 |
+
@@ -185,12 +185,8 @@ endif(WITH_XIMEA)
|
157 |
+
# --- FFMPEG ---
|
158 |
+
ocv_clear_vars(HAVE_FFMPEG)
|
159 |
+
if(WITH_FFMPEG)
|
160 |
+
- if(WIN32 AND NOT ARM)
|
161 |
+
- include("${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/ffmpeg_version.cmake")
|
162 |
+
+ find_package(FFMPEG REQUIRED)
|
163 |
+
set(HAVE_FFMPEG TRUE)
|
164 |
+
- elseif(PKG_CONFIG_FOUND)
|
165 |
+
- ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale)
|
166 |
+
- ocv_check_modules(FFMPEG_libavresample libavresample)
|
167 |
+
if(FFMPEG_libavresample_FOUND)
|
168 |
+
ocv_append_build_options(FFMPEG FFMPEG_libavresample)
|
169 |
+
endif()
|
170 |
+
@@ -211,9 +207,6 @@ if(WITH_FFMPEG)
|
171 |
+
ocv_append_build_options(HIGHGUI FFMPEG)
|
172 |
+
endif()
|
173 |
+
endif()
|
174 |
+
- else()
|
175 |
+
- message(STATUS "Can't find ffmpeg - 'pkg-config' utility is missing")
|
176 |
+
- endif()
|
177 |
+
endif(WITH_FFMPEG)
|
178 |
+
|
179 |
+
# --- VideoInput/DirectShow ---
|
180 |
+
--- a/cmake/OpenCVGenConfig.cmake
|
181 |
+
+++ b/cmake/OpenCVGenConfig.cmake
|
182 |
+
@@ -101,7 +101,7 @@ endif()
|
183 |
+
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" @ONLY)
|
184 |
+
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" @ONLY)
|
185 |
+
|
186 |
+
-if(UNIX) # ANDROID configuration is created here also
|
187 |
+
+if(1) # ANDROID configuration is created here also
|
188 |
+
#http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference
|
189 |
+
# For a command "find_package(<name> [major[.minor]] [EXACT] [REQUIRED|QUIET])"
|
190 |
+
# cmake will look in the following dir on unix:
|
191 |
+
@@ -126,7 +126,7 @@ endif()
|
192 |
+
# --------------------------------------------------------------------------------------------
|
193 |
+
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
|
194 |
+
# --------------------------------------------------------------------------------------------
|
195 |
+
-if(WIN32)
|
196 |
+
+if(0)
|
197 |
+
set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
|
198 |
+
set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
|
199 |
+
|
200 |
+
--- a/cmake/OpenCVModule.cmake
|
201 |
+
+++ b/cmake/OpenCVModule.cmake
|
202 |
+
@@ -86,10 +86,10 @@ macro(ocv_add_dependencies full_modname)
|
203 |
+
endforeach()
|
204 |
+
unset(__depsvar)
|
205 |
+
|
206 |
+
- ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS)
|
207 |
+
- ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS)
|
208 |
+
- ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS)
|
209 |
+
- ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS)
|
210 |
+
+ #ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS)
|
211 |
+
+ #ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS)
|
212 |
+
+ #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS)
|
213 |
+
+ #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS)
|
214 |
+
|
215 |
+
set(OPENCV_MODULE_${full_modname}_REQ_DEPS ${OPENCV_MODULE_${full_modname}_REQ_DEPS}
|
216 |
+
CACHE INTERNAL "Required dependencies of ${full_modname} module")
|
217 |
+
@@ -277,7 +277,7 @@ endfunction()
|
218 |
+
|
219 |
+
# sort modules by dependencies
|
220 |
+
function(__ocv_sort_modules_by_deps __lst)
|
221 |
+
- ocv_list_sort(${__lst})
|
222 |
+
+ #ocv_list_sort(${__lst})
|
223 |
+
set(${__lst}_ORDERED ${${__lst}} CACHE INTERNAL "")
|
224 |
+
set(__result "")
|
225 |
+
foreach (m ${${__lst}})
|
226 |
+
@@ -382,7 +382,7 @@ function(__ocv_resolve_dependencies)
|
227 |
+
endforeach()
|
228 |
+
endforeach()
|
229 |
+
|
230 |
+
- ocv_list_sort(OPENCV_MODULES_BUILD)
|
231 |
+
+ #ocv_list_sort(OPENCV_MODULES_BUILD)
|
232 |
+
|
233 |
+
foreach(m ${OPENCV_MODULES_BUILD})
|
234 |
+
# message(STATUS "FULL deps of ${m}: ${deps_${m}}")
|
235 |
+
@@ -397,7 +397,7 @@ function(__ocv_resolve_dependencies)
|
236 |
+
# reorder dependencies
|
237 |
+
foreach(m ${OPENCV_MODULES_BUILD})
|
238 |
+
__ocv_sort_modules_by_deps(OPENCV_MODULE_${m}_DEPS)
|
239 |
+
- ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT)
|
240 |
+
+ #ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT)
|
241 |
+
|
242 |
+
set(OPENCV_MODULE_${m}_DEPS ${OPENCV_MODULE_${m}_DEPS} CACHE INTERNAL "Flattened dependencies of ${m} module")
|
243 |
+
set(OPENCV_MODULE_${m}_DEPS_EXT ${OPENCV_MODULE_${m}_DEPS_EXT} CACHE INTERNAL "Extra dependencies of ${m} module")
|
244 |
+
--- a/data/CMakeLists.txt
|
245 |
+
+++ b/data/CMakeLists.txt
|
246 |
+
@@ -5,8 +5,6 @@ if(ANDROID)
|
247 |
+
install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs)
|
248 |
+
install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT libs)
|
249 |
+
else()
|
250 |
+
- install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs)
|
251 |
+
- install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT libs)
|
252 |
+
endif()
|
253 |
+
|
254 |
+
if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
|
255 |
+
@@ -51,4 +49,4 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
|
256 |
+
install(FILES ${DATAFILES_CASCADES} DESTINATION share/OpenCV/testdata/data/haarcascades COMPONENT tests)
|
257 |
+
endif()
|
258 |
+
endif()
|
259 |
+
-endif()
|
260 |
+
|
261 |
+
+endif()
|
262 |
+
--- a/modules/core/CMakeLists.txt
|
263 |
+
+++ b/modules/core/CMakeLists.txt
|
264 |
+
@@ -1,9 +1,9 @@
|
265 |
+
set(the_description "The Core Functionality")
|
266 |
+
|
267 |
+
if (NOT HAVE_CUDA OR ENABLE_DYNAMIC_CUDA)
|
268 |
+
- ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES})
|
269 |
+
+ ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB)
|
270 |
+
else()
|
271 |
+
- ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
|
272 |
+
+ ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
|
273 |
+
endif()
|
274 |
+
|
275 |
+
ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/dynamicuda/include/" ${ZLIB_INCLUDE_DIR})
|
276 |
+
--- a/modules/highgui/CMakeLists.txt
|
277 |
+
+++ b/modules/highgui/CMakeLists.txt
|
278 |
+
@@ -15,23 +15,23 @@ endif()
|
279 |
+
|
280 |
+
if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR)
|
281 |
+
ocv_include_directories(${ZLIB_INCLUDE_DIR})
|
282 |
+
- list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})
|
283 |
+
+ list(APPEND GRFMT_LIBS ZLIB::ZLIB)
|
284 |
+
endif()
|
285 |
+
|
286 |
+
if(HAVE_JPEG)
|
287 |
+
ocv_include_directories(${JPEG_INCLUDE_DIR})
|
288 |
+
- list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES})
|
289 |
+
+ list(APPEND GRFMT_LIBS JPEG::JPEG)
|
290 |
+
endif()
|
291 |
+
|
292 |
+
if(HAVE_PNG)
|
293 |
+
add_definitions(${PNG_DEFINITIONS})
|
294 |
+
ocv_include_directories(${PNG_INCLUDE_DIR})
|
295 |
+
- list(APPEND GRFMT_LIBS ${PNG_LIBRARIES})
|
296 |
+
+ list(APPEND GRFMT_LIBS PNG::PNG)
|
297 |
+
endif()
|
298 |
+
|
299 |
+
if(HAVE_TIFF)
|
300 |
+
ocv_include_directories(${TIFF_INCLUDE_DIR})
|
301 |
+
- list(APPEND GRFMT_LIBS ${TIFF_LIBRARIES})
|
302 |
+
+ list(APPEND GRFMT_LIBS TIFF::TIFF)
|
303 |
+
endif()
|
304 |
+
|
305 |
+
if(HAVE_JASPER)
|
306 |
+
@@ -296,38 +296,5 @@ endif()
|
307 |
+
ocv_add_precompiled_headers(${the_module})
|
308 |
+
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations -Wno-clobbered)
|
309 |
+
|
310 |
+
-if(WIN32 AND WITH_FFMPEG)
|
311 |
+
- #copy ffmpeg dll to the output folder
|
312 |
+
- if(MSVC64 OR MINGW64)
|
313 |
+
- set(FFMPEG_SUFFIX _64)
|
314 |
+
- endif()
|
315 |
+
-
|
316 |
+
- set(ffmpeg_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll")
|
317 |
+
- set(ffmpeg_bare_name_ver "opencv_ffmpeg${OPENCV_DLLVERSION}${FFMPEG_SUFFIX}.dll")
|
318 |
+
- set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}")
|
319 |
+
-
|
320 |
+
- #if(MSVC AND CMAKE_VERSION VERSION_GREATER "2.8.2")
|
321 |
+
- # add_custom_command(TARGET ${the_module} POST_BUILD
|
322 |
+
- # COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$<CONFIGURATION>/${ffmpeg_bare_name_ver}"
|
323 |
+
- # COMMENT "Copying ${ffmpeg_path} to the output directory")
|
324 |
+
- #else
|
325 |
+
- if(MSVC_IDE)
|
326 |
+
- add_custom_command(TARGET ${the_module} POST_BUILD
|
327 |
+
- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Release/${ffmpeg_bare_name_ver}"
|
328 |
+
- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Debug/${ffmpeg_bare_name_ver}"
|
329 |
+
- COMMENT "Copying ${ffmpeg_path} to the output directory")
|
330 |
+
- elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Visual"))
|
331 |
+
- add_custom_command(TARGET ${the_module} POST_BUILD
|
332 |
+
- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${ffmpeg_bare_name_ver}"
|
333 |
+
- COMMENT "Copying ${ffmpeg_path} to the output directory")
|
334 |
+
- else()
|
335 |
+
- add_custom_command(TARGET ${the_module} POST_BUILD
|
336 |
+
- COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${ffmpeg_bare_name_ver}"
|
337 |
+
- COMMENT "Copying ${ffmpeg_path} to the output directory")
|
338 |
+
- endif()
|
339 |
+
-
|
340 |
+
- install(FILES "${ffmpeg_path}" DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs RENAME "${ffmpeg_bare_name_ver}")
|
341 |
+
-endif()
|
342 |
+
-
|
343 |
+
ocv_add_accuracy_tests()
|
344 |
+
ocv_add_perf_tests()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0003-force-package-requirements.patch
ADDED
@@ -0,0 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
2 |
+
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
3 |
+
@@ -6,7 +6,7 @@
|
4 |
+
if(BUILD_ZLIB)
|
5 |
+
ocv_clear_vars(ZLIB_FOUND)
|
6 |
+
else()
|
7 |
+
- include(FindZLIB)
|
8 |
+
+ find_package(ZLIB REQUIRED)
|
9 |
+
if(ZLIB_FOUND AND ANDROID)
|
10 |
+
if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
|
11 |
+
ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
|
12 |
+
@@ -32,7 +32,7 @@ if(WITH_TIFF)
|
13 |
+
if(BUILD_TIFF)
|
14 |
+
ocv_clear_vars(TIFF_FOUND)
|
15 |
+
else()
|
16 |
+
- include(FindTIFF)
|
17 |
+
+ find_package(TIFF REQUIRED)
|
18 |
+
if(TIFF_FOUND)
|
19 |
+
ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
|
20 |
+
endif()
|
21 |
+
@@ -74,7 +74,7 @@ if(WITH_JPEG)
|
22 |
+
if(BUILD_JPEG)
|
23 |
+
ocv_clear_vars(JPEG_FOUND)
|
24 |
+
else()
|
25 |
+
- include(FindJPEG)
|
26 |
+
+ find_package(JPEG REQUIRED)
|
27 |
+
endif()
|
28 |
+
|
29 |
+
if(NOT JPEG_FOUND)
|
30 |
+
@@ -95,7 +95,7 @@ if(WITH_JASPER)
|
31 |
+
if(BUILD_JASPER)
|
32 |
+
ocv_clear_vars(JASPER_FOUND)
|
33 |
+
else()
|
34 |
+
- include(FindJasper)
|
35 |
+
+ find_package(Jasper REQUIRED)
|
36 |
+
endif()
|
37 |
+
|
38 |
+
if(NOT JASPER_FOUND)
|
39 |
+
@@ -119,7 +119,7 @@ if(WITH_PNG)
|
40 |
+
if(BUILD_PNG)
|
41 |
+
ocv_clear_vars(PNG_FOUND)
|
42 |
+
else()
|
43 |
+
- include(FindPNG)
|
44 |
+
+ find_package(PNG REQUIRED)
|
45 |
+
if(PNG_FOUND)
|
46 |
+
include(CheckIncludeFile)
|
47 |
+
check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
|
48 |
+
@@ -151,7 +151,7 @@ if(WITH_OPENEXR)
|
49 |
+
if(BUILD_OPENEXR)
|
50 |
+
ocv_clear_vars(OPENEXR_FOUND)
|
51 |
+
else()
|
52 |
+
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
53 |
+
+ find_package(OpenEXR REQUIRED)
|
54 |
+
endif()
|
55 |
+
|
56 |
+
if(NOT OPENEXR_FOUND)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0004-add-ffmpeg-missing-defines.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
|
2 |
+
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
|
3 |
+
@@ -42,6 +42,9 @@
|
4 |
+
|
5 |
+
#define HAVE_FFMPEG_SWSCALE
|
6 |
+
#define HAVE_GENTOO_FFMPEG
|
7 |
+
+#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
|
8 |
+
+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
|
9 |
+
+#define AVFMT_RAWPICTURE 0x0020
|
10 |
+
|
11 |
+
#include "cap_ffmpeg_api.hpp"
|
12 |
+
#include <assert.h>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/0005-fix-cuda.patch
ADDED
@@ -0,0 +1,140 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVDetectCUDA.cmake
|
2 |
+
+++ b/cmake/OpenCVDetectCUDA.cmake
|
3 |
+
@@ -51,7 +51,6 @@ if(CUDA_FOUND)
|
4 |
+
|
5 |
+
message(STATUS "CUDA detected: " ${CUDA_VERSION})
|
6 |
+
|
7 |
+
- set(_generations "Fermi" "Kepler")
|
8 |
+
if(NOT CMAKE_CROSSCOMPILING)
|
9 |
+
list(APPEND _generations "Auto")
|
10 |
+
endif()
|
11 |
+
@@ -69,48 +68,8 @@ if(CUDA_FOUND)
|
12 |
+
unset(CUDA_ARCH_PTX CACHE)
|
13 |
+
endif()
|
14 |
+
|
15 |
+
- set(__cuda_arch_ptx "")
|
16 |
+
- if(CUDA_GENERATION STREQUAL "Fermi")
|
17 |
+
- set(__cuda_arch_bin "2.0 2.1(2.0)")
|
18 |
+
- elseif(CUDA_GENERATION STREQUAL "Kepler")
|
19 |
+
- if(${CUDA_VERSION} VERSION_LESS "5.0")
|
20 |
+
- set(__cuda_arch_bin "3.0")
|
21 |
+
- else()
|
22 |
+
- set(__cuda_arch_bin "3.0 3.5")
|
23 |
+
- endif()
|
24 |
+
- elseif(CUDA_GENERATION STREQUAL "Auto")
|
25 |
+
- execute_process( COMMAND "${CUDA_NVCC_EXECUTABLE}" "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run"
|
26 |
+
- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/"
|
27 |
+
- RESULT_VARIABLE _nvcc_res OUTPUT_VARIABLE _nvcc_out
|
28 |
+
- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
29 |
+
- if(NOT _nvcc_res EQUAL 0)
|
30 |
+
- message(STATUS "Automatic detection of CUDA generation failed. Going to build for all known architectures.")
|
31 |
+
- else()
|
32 |
+
- set(__cuda_arch_bin "${_nvcc_out}")
|
33 |
+
- string(REPLACE "2.1" "2.1(2.0)" __cuda_arch_bin "${__cuda_arch_bin}")
|
34 |
+
- endif()
|
35 |
+
- endif()
|
36 |
+
-
|
37 |
+
- if(NOT DEFINED __cuda_arch_bin)
|
38 |
+
- if(ANDROID)
|
39 |
+
- if (ARM)
|
40 |
+
- set(__cuda_arch_bin "3.2")
|
41 |
+
- set(__cuda_arch_ptx "")
|
42 |
+
- elseif(AARCH64)
|
43 |
+
- set(__cuda_arch_bin "5.3")
|
44 |
+
- set(__cuda_arch_ptx "")
|
45 |
+
- endif()
|
46 |
+
- else()
|
47 |
+
- if(${CUDA_VERSION} VERSION_LESS "5.0")
|
48 |
+
- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0")
|
49 |
+
- elseif(${CUDA_VERSION} VERSION_GREATER "6.5")
|
50 |
+
- set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5")
|
51 |
+
- else()
|
52 |
+
- set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5")
|
53 |
+
- endif()
|
54 |
+
- set(__cuda_arch_ptx "3.0")
|
55 |
+
- endif()
|
56 |
+
- endif()
|
57 |
+
+ set(__cuda_arch_ptx "5.0")
|
58 |
+
+ set(__cuda_arch_bin "5.0")
|
59 |
+
|
60 |
+
set(CUDA_ARCH_BIN ${__cuda_arch_bin} CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")
|
61 |
+
set(CUDA_ARCH_PTX ${__cuda_arch_ptx} CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for")
|
62 |
+
@@ -229,18 +188,40 @@ else()
|
63 |
+
endif()
|
64 |
+
|
65 |
+
if(HAVE_CUDA)
|
66 |
+
+ set(CUDA_LIBS_PATH "")
|
67 |
+
+ foreach(p ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
|
68 |
+
+ get_filename_component(_tmp ${p} PATH)
|
69 |
+
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
70 |
+
+ endforeach()
|
71 |
+
+
|
72 |
+
+ if(HAVE_CUBLAS)
|
73 |
+
+ foreach(p ${CUDA_cublas_LIBRARY})
|
74 |
+
+ get_filename_component(_tmp ${p} PATH)
|
75 |
+
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
76 |
+
+ endforeach()
|
77 |
+
+ endif()
|
78 |
+
+
|
79 |
+
+ if(HAVE_CUFFT)
|
80 |
+
+ foreach(p ${CUDA_cufft_LIBRARY})
|
81 |
+
+ get_filename_component(_tmp ${p} PATH)
|
82 |
+
+ list(APPEND CUDA_LIBS_PATH ${_tmp})
|
83 |
+
+ endforeach()
|
84 |
+
+ endif()
|
85 |
+
+
|
86 |
+
+ list(REMOVE_DUPLICATES CUDA_LIBS_PATH)
|
87 |
+
+ link_directories(${CUDA_LIBS_PATH})
|
88 |
+
+
|
89 |
+
set(CUDA_LIBRARIES_ABS ${CUDA_LIBRARIES})
|
90 |
+
- ocv_create_imported_targets(CUDA_LIBRARIES ${CUDA_LIBRARIES})
|
91 |
+
+ ocv_convert_to_lib_name(CUDA_LIBRARIES ${CUDA_LIBRARIES})
|
92 |
+
set(CUDA_npp_LIBRARY_ABS ${CUDA_npp_LIBRARY})
|
93 |
+
- ocv_create_imported_targets(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
|
94 |
+
-
|
95 |
+
+ ocv_convert_to_lib_name(CUDA_npp_LIBRARY ${CUDA_npp_LIBRARY})
|
96 |
+
if(HAVE_CUBLAS)
|
97 |
+
set(CUDA_cublas_LIBRARY_ABS ${CUDA_cublas_LIBRARY})
|
98 |
+
- ocv_create_imported_targets(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
|
99 |
+
+ ocv_convert_to_lib_name(CUDA_cublas_LIBRARY ${CUDA_cublas_LIBRARY})
|
100 |
+
endif()
|
101 |
+
|
102 |
+
if(HAVE_CUFFT)
|
103 |
+
set(CUDA_cufft_LIBRARY_ABS ${CUDA_cufft_LIBRARY})
|
104 |
+
- ocv_create_imported_targets(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
|
105 |
+
+ ocv_convert_to_lib_name(CUDA_cufft_LIBRARY ${CUDA_cufft_LIBRARY})
|
106 |
+
endif()
|
107 |
+
endif()
|
108 |
+
--- a/cmake/templates/OpenCVConfig.cmake.in
|
109 |
+
+++ b/cmake/templates/OpenCVConfig.cmake.in
|
110 |
+
@@ -256,7 +256,7 @@ if(OpenCV_CUDA_VERSION)
|
111 |
+
|
112 |
+
set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES})
|
113 |
+
|
114 |
+
- if(${CUDA_VERSION} VERSION_LESS "5.5")
|
115 |
+
+ if(CUDA_VERSION VERSION_LESS "5.5")
|
116 |
+
list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY})
|
117 |
+
else()
|
118 |
+
find_cuda_helper_libs(nppc)
|
119 |
+
@@ -281,14 +281,16 @@ if(OpenCV_CUDA_VERSION)
|
120 |
+
list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_nvcuvenc_LIBRARIES})
|
121 |
+
endif()
|
122 |
+
|
123 |
+
+ set(OpenCV_CUDA_LIBS_RELPATH "")
|
124 |
+
foreach(l ${OpenCV_CUDA_LIBS_ABSPATH})
|
125 |
+
- get_filename_component(_tmp "${l}" NAME_WE)
|
126 |
+
- string(REGEX REPLACE "^lib" "" _tmp "${_tmp}")
|
127 |
+
- if(NOT TARGET "opencv_dep_${_tmp}") # protect against repeated inclusions
|
128 |
+
- add_library("opencv_dep_${_tmp}" UNKNOWN IMPORTED)
|
129 |
+
- set_target_properties("opencv_dep_${_tmp}" PROPERTIES IMPORTED_LOCATION "${l}")
|
130 |
+
+ get_filename_component(_tmp ${l} PATH)
|
131 |
+
+ if(NOT ${_tmp} MATCHES "-Wl.*")
|
132 |
+
+ list(APPEND OpenCV_CUDA_LIBS_RELPATH ${_tmp})
|
133 |
+
endif()
|
134 |
+
endforeach()
|
135 |
+
+
|
136 |
+
+ list(REMOVE_DUPLICATES OpenCV_CUDA_LIBS_RELPATH)
|
137 |
+
+ link_directories(${OpenCV_CUDA_LIBS_RELPATH})
|
138 |
+
endif()
|
139 |
+
|
140 |
+
# ==============================================================
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/fix-path-contains-++-error.patch
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
|
2 |
+
index 72df4d4..7d45974 100644
|
3 |
+
--- a/cmake/OpenCVUtils.cmake
|
4 |
+
+++ b/cmake/OpenCVUtils.cmake
|
5 |
+
@@ -82,12 +82,42 @@ macro(ocv_check_environment_variables)
|
6 |
+
endforeach()
|
7 |
+
endmacro()
|
8 |
+
|
9 |
+
+# check if "sub" (file or dir) is below "dir"
|
10 |
+
+function(is_subdir res dir sub )
|
11 |
+
+ get_filename_component(dir "${dir}" ABSOLUTE)
|
12 |
+
+ get_filename_component(sub "${sub}" ABSOLUTE)
|
13 |
+
+ file(TO_CMAKE_PATH "${dir}" dir)
|
14 |
+
+ file(TO_CMAKE_PATH "${sub}" sub)
|
15 |
+
+ set(dir "${dir}/")
|
16 |
+
+ string(LENGTH "${dir}" len)
|
17 |
+
+ string(LENGTH "${sub}" len_sub)
|
18 |
+
+ if(NOT len GREATER len_sub)
|
19 |
+
+ string(SUBSTRING "${sub}" 0 ${len} prefix)
|
20 |
+
+ endif()
|
21 |
+
+ if(prefix AND prefix STREQUAL dir)
|
22 |
+
+ set(${res} TRUE PARENT_SCOPE)
|
23 |
+
+ else()
|
24 |
+
+ set(${res} FALSE PARENT_SCOPE)
|
25 |
+
+ endif()
|
26 |
+
+endfunction()
|
27 |
+
+
|
28 |
+
+function(ocv_is_opencv_directory result_var dir)
|
29 |
+
+ set(result FALSE)
|
30 |
+
+ foreach(parent ${OpenCV_SOURCE_DIR} ${OpenCV_BINARY_DIR} ${OPENCV_EXTRA_MODULES_PATH})
|
31 |
+
+ is_subdir(result "${parent}" "${dir}")
|
32 |
+
+ if(result)
|
33 |
+
+ break()
|
34 |
+
+ endif()
|
35 |
+
+ endforeach()
|
36 |
+
+ set(${result_var} ${result} PARENT_SCOPE)
|
37 |
+
+endfunction()
|
38 |
+
+
|
39 |
+
# adds include directories in such a way that directories from the OpenCV source tree go first
|
40 |
+
function(ocv_include_directories)
|
41 |
+
set(__add_before "")
|
42 |
+
foreach(dir ${ARGN})
|
43 |
+
- get_filename_component(__abs_dir "${dir}" ABSOLUTE)
|
44 |
+
- if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
|
45 |
+
+ ocv_is_opencv_directory(__is_opencv_dir "${dir}")
|
46 |
+
+ if(__is_opencv_dir)
|
47 |
+
list(APPEND __add_before "${dir}")
|
48 |
+
elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND
|
49 |
+
dir MATCHES "/usr/include$")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/portfile.cmake
ADDED
@@ -0,0 +1,203 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3")
|
2 |
+
message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3")
|
3 |
+
endif()
|
4 |
+
|
5 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
|
6 |
+
message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
|
10 |
+
string(JSON OPENCV_VERSION GET "${_contents}" version)
|
11 |
+
|
12 |
+
vcpkg_from_github(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
REPO opencv/opencv
|
15 |
+
REF ${OPENCV_VERSION}
|
16 |
+
SHA512 de7d24ac7ed78ac14673011cbecc477cae688b74222a972e553c95a557b5cb8e5913f97db525421d6a72af30998ca300112fa0b285daed65f65832eb2cf7241a
|
17 |
+
HEAD_REF master
|
18 |
+
PATCHES
|
19 |
+
0002-install-options.patch
|
20 |
+
0003-force-package-requirements.patch
|
21 |
+
0004-add-ffmpeg-missing-defines.patch
|
22 |
+
0005-fix-cuda.patch
|
23 |
+
fix-path-contains-++-error.patch
|
24 |
+
)
|
25 |
+
|
26 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake")
|
27 |
+
file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA")
|
28 |
+
|
29 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
30 |
+
FEATURES
|
31 |
+
"cuda" WITH_CUDA
|
32 |
+
"eigen" WITH_EIGEN
|
33 |
+
"ffmpeg" WITH_FFMPEG
|
34 |
+
"jasper" WITH_JASPER
|
35 |
+
"jpeg" WITH_JPEG
|
36 |
+
"openexr" WITH_OPENEXR
|
37 |
+
"opengl" WITH_OPENGL
|
38 |
+
"png" WITH_PNG
|
39 |
+
"qt" WITH_QT
|
40 |
+
"tiff" WITH_TIFF
|
41 |
+
"world" BUILD_opencv_world
|
42 |
+
)
|
43 |
+
|
44 |
+
set(WITH_MSMF ON)
|
45 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
|
46 |
+
set(WITH_MSMF OFF)
|
47 |
+
endif()
|
48 |
+
|
49 |
+
set(WITH_GTK OFF)
|
50 |
+
if("gtk" IN_LIST FEATURES)
|
51 |
+
if(VCPKG_TARGET_IS_LINUX)
|
52 |
+
set(WITH_GTK ON)
|
53 |
+
else()
|
54 |
+
message(WARNING "The gtk module cannot be enabled outside Linux")
|
55 |
+
endif()
|
56 |
+
endif()
|
57 |
+
|
58 |
+
if("ffmpeg" IN_LIST FEATURES)
|
59 |
+
if(VCPKG_TARGET_IS_UWP)
|
60 |
+
set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}")
|
61 |
+
set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}")
|
62 |
+
endif()
|
63 |
+
endif()
|
64 |
+
|
65 |
+
set(WITH_PYTHON OFF)
|
66 |
+
if("python" IN_LIST FEATURES)
|
67 |
+
set(WITH_PYTHON ON)
|
68 |
+
vcpkg_find_acquire_program(PYTHON2)
|
69 |
+
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
|
70 |
+
vcpkg_add_to_path("${PYTHON2_DIR}")
|
71 |
+
vcpkg_add_to_path("${PYTHON2_DIR}/Scripts")
|
72 |
+
set(ENV{PYTHON} "${PYTHON2}")
|
73 |
+
|
74 |
+
function(vcpkg_get_python_package PYTHON_DIR )
|
75 |
+
cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES")
|
76 |
+
|
77 |
+
if(NOT _vgpp_PYTHON_EXECUTABLE)
|
78 |
+
message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!")
|
79 |
+
endif()
|
80 |
+
if(NOT _vgpp_PACKAGES)
|
81 |
+
message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!")
|
82 |
+
endif()
|
83 |
+
if(NOT _vgpp_PYTHON_DIR)
|
84 |
+
get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY)
|
85 |
+
endif()
|
86 |
+
|
87 |
+
if (WIN32)
|
88 |
+
set(PYTHON_OPTION "")
|
89 |
+
else()
|
90 |
+
set(PYTHON_OPTION "--user")
|
91 |
+
endif()
|
92 |
+
|
93 |
+
if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
94 |
+
if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
95 |
+
vcpkg_from_github(
|
96 |
+
OUT_SOURCE_PATH PYFILE_PATH
|
97 |
+
REPO pypa/get-pip
|
98 |
+
REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
|
99 |
+
SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
|
100 |
+
HEAD_REF master
|
101 |
+
)
|
102 |
+
execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION})
|
103 |
+
endif()
|
104 |
+
foreach(_package IN LISTS _vgpp_PACKAGES)
|
105 |
+
execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION})
|
106 |
+
endforeach()
|
107 |
+
else()
|
108 |
+
foreach(_package IN LISTS _vgpp_PACKAGES)
|
109 |
+
execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package})
|
110 |
+
endforeach()
|
111 |
+
endif()
|
112 |
+
endfunction()
|
113 |
+
vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON2}" PACKAGES numpy)
|
114 |
+
endif()
|
115 |
+
|
116 |
+
vcpkg_cmake_configure(
|
117 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
118 |
+
OPTIONS
|
119 |
+
###### ocv_options
|
120 |
+
-DCMAKE_DEBUG_POSTFIX=d
|
121 |
+
# Do not build docs/examples
|
122 |
+
-DBUILD_DOCS=OFF
|
123 |
+
-DBUILD_EXAMPLES=OFF
|
124 |
+
###### Disable build 3rd party libs
|
125 |
+
-DBUILD_JASPER=OFF
|
126 |
+
-DBUILD_JPEG=OFF
|
127 |
+
-DBUILD_OPENEXR=OFF
|
128 |
+
-DBUILD_PNG=OFF
|
129 |
+
-DBUILD_TIFF=OFF
|
130 |
+
-DBUILD_TBB=OFF
|
131 |
+
-DBUILD_ZLIB=OFF
|
132 |
+
###### OpenCV Build components
|
133 |
+
-DBUILD_opencv_apps=OFF
|
134 |
+
-DBUILD_PACKAGE=OFF
|
135 |
+
-DBUILD_PERF_TESTS=OFF
|
136 |
+
-DBUILD_TESTS=OFF
|
137 |
+
-DBUILD_WITH_DEBUG_INFO=ON
|
138 |
+
# CMAKE
|
139 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
|
140 |
+
###### customized properties
|
141 |
+
## Options from vcpkg_check_features()
|
142 |
+
${FEATURE_OPTIONS}
|
143 |
+
-DWITH_1394=OFF
|
144 |
+
-DWITH_IPP=OFF
|
145 |
+
-DWITH_LAPACK=OFF
|
146 |
+
-DWITH_MSMF=${WITH_MSMF}
|
147 |
+
-DWITH_OPENCLAMDBLAS=OFF
|
148 |
+
-DWITH_OPENMP=OFF
|
149 |
+
-DWITH_PYTHON=${WITH_PYTHON}
|
150 |
+
-DWITH_ZLIB=ON
|
151 |
+
-WITH_GTK=${WITH_GTK}
|
152 |
+
-DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix
|
153 |
+
)
|
154 |
+
|
155 |
+
vcpkg_cmake_install()
|
156 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv")
|
157 |
+
vcpkg_copy_pdbs()
|
158 |
+
|
159 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
160 |
+
file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES)
|
161 |
+
|
162 |
+
set(DEPS_STRING "include(CMakeFindDependencyMacro)
|
163 |
+
find_dependency(Threads)")
|
164 |
+
if("tiff" IN_LIST FEATURES)
|
165 |
+
string(APPEND DEPS_STRING "\nfind_dependency(TIFF)")
|
166 |
+
endif()
|
167 |
+
if("cuda" IN_LIST FEATURES)
|
168 |
+
string(APPEND DEPS_STRING "\nfind_dependency(CUDA)")
|
169 |
+
endif()
|
170 |
+
if("openexr" IN_LIST FEATURES)
|
171 |
+
string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
|
172 |
+
endif()
|
173 |
+
if("png" IN_LIST FEATURES)
|
174 |
+
string(APPEND DEPS_STRING "\nfind_dependency(PNG)")
|
175 |
+
endif()
|
176 |
+
if("qt" IN_LIST FEATURES)
|
177 |
+
string(APPEND DEPS_STRING "
|
178 |
+
set(CMAKE_AUTOMOC ON)
|
179 |
+
set(CMAKE_AUTORCC ON)
|
180 |
+
set(CMAKE_AUTOUIC ON)
|
181 |
+
find_dependency(Qt5 COMPONENTS Core Gui Widgets Test Concurrent)")
|
182 |
+
if("opengl" IN_LIST FEATURES)
|
183 |
+
string(APPEND DEPS_STRING "
|
184 |
+
find_dependency(Qt5 COMPONENTS OpenGL)")
|
185 |
+
endif()
|
186 |
+
endif()
|
187 |
+
|
188 |
+
string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)"
|
189 |
+
"set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}")
|
190 |
+
|
191 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}")
|
192 |
+
|
193 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
194 |
+
endif()
|
195 |
+
|
196 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
197 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
198 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE")
|
199 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE")
|
200 |
+
|
201 |
+
vcpkg_fixup_pkgconfig()
|
202 |
+
|
203 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv2/vcpkg.json
ADDED
@@ -0,0 +1,132 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencv2",
|
3 |
+
"version": "2.4.13.7",
|
4 |
+
"port-version": 11,
|
5 |
+
"description": "computer vision library",
|
6 |
+
"homepage": "https://github.com/opencv/opencv",
|
7 |
+
"license": "BSD-3-Clause",
|
8 |
+
"supports": "!uwp",
|
9 |
+
"dependencies": [
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
"zlib"
|
19 |
+
],
|
20 |
+
"default-features": [
|
21 |
+
"default-features"
|
22 |
+
],
|
23 |
+
"features": {
|
24 |
+
"cuda": {
|
25 |
+
"description": "CUDA support for opencv",
|
26 |
+
"dependencies": [
|
27 |
+
"cuda"
|
28 |
+
]
|
29 |
+
},
|
30 |
+
"default-features": {
|
31 |
+
"description": "Platform-dependent default features",
|
32 |
+
"dependencies": [
|
33 |
+
{
|
34 |
+
"name": "opencv2",
|
35 |
+
"default-features": false,
|
36 |
+
"features": [
|
37 |
+
"eigen",
|
38 |
+
"jpeg",
|
39 |
+
"png",
|
40 |
+
"tiff"
|
41 |
+
]
|
42 |
+
},
|
43 |
+
{
|
44 |
+
"name": "opencv2",
|
45 |
+
"default-features": false,
|
46 |
+
"features": [
|
47 |
+
"gtk"
|
48 |
+
],
|
49 |
+
"platform": "linux"
|
50 |
+
}
|
51 |
+
]
|
52 |
+
},
|
53 |
+
"eigen": {
|
54 |
+
"description": "Eigen support for opencv",
|
55 |
+
"dependencies": [
|
56 |
+
"eigen3"
|
57 |
+
]
|
58 |
+
},
|
59 |
+
"ffmpeg": {
|
60 |
+
"description": "ffmpeg support for opencv",
|
61 |
+
"dependencies": [
|
62 |
+
{
|
63 |
+
"name": "ffmpeg",
|
64 |
+
"default-features": false,
|
65 |
+
"features": [
|
66 |
+
"avcodec",
|
67 |
+
"avformat",
|
68 |
+
"swresample",
|
69 |
+
"swscale"
|
70 |
+
]
|
71 |
+
}
|
72 |
+
]
|
73 |
+
},
|
74 |
+
"gtk": {
|
75 |
+
"description": "GTK support for opencv",
|
76 |
+
"dependencies": [
|
77 |
+
"gtk"
|
78 |
+
]
|
79 |
+
},
|
80 |
+
"jasper": {
|
81 |
+
"description": "JPEG 2000 support for opencv",
|
82 |
+
"dependencies": [
|
83 |
+
"jasper"
|
84 |
+
]
|
85 |
+
},
|
86 |
+
"jpeg": {
|
87 |
+
"description": "JPEG support for opencv",
|
88 |
+
"dependencies": [
|
89 |
+
"libjpeg-turbo"
|
90 |
+
]
|
91 |
+
},
|
92 |
+
"openexr": {
|
93 |
+
"description": "OpenEXR support for opencv",
|
94 |
+
"dependencies": [
|
95 |
+
"openexr"
|
96 |
+
]
|
97 |
+
},
|
98 |
+
"opengl": {
|
99 |
+
"description": "opengl support for opencv",
|
100 |
+
"dependencies": [
|
101 |
+
"opengl"
|
102 |
+
]
|
103 |
+
},
|
104 |
+
"png": {
|
105 |
+
"description": "PNG support for opencv",
|
106 |
+
"dependencies": [
|
107 |
+
"libpng"
|
108 |
+
]
|
109 |
+
},
|
110 |
+
"python": {
|
111 |
+
"description": "Python wrapper support for opencv"
|
112 |
+
},
|
113 |
+
"qt": {
|
114 |
+
"description": "Qt GUI support for opencv",
|
115 |
+
"dependencies": [
|
116 |
+
{
|
117 |
+
"name": "qt5-base",
|
118 |
+
"default-features": false
|
119 |
+
}
|
120 |
+
]
|
121 |
+
},
|
122 |
+
"tiff": {
|
123 |
+
"description": "TIFF support for opencv",
|
124 |
+
"dependencies": [
|
125 |
+
"tiff"
|
126 |
+
]
|
127 |
+
},
|
128 |
+
"world": {
|
129 |
+
"description": "Compile to a single package support for opencv"
|
130 |
+
}
|
131 |
+
}
|
132 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0001-disable-downloading.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVDownload.cmake
|
2 |
+
+++ b/cmake/OpenCVDownload.cmake
|
3 |
+
@@ -157,6 +157,9 @@ function(ocv_download)
|
4 |
+
# Download
|
5 |
+
if(NOT EXISTS "${CACHE_CANDIDATE}")
|
6 |
+
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
|
7 |
+
+ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
|
8 |
+
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )")
|
9 |
+
+
|
10 |
+
foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
|
11 |
+
ocv_download_log("#try ${try}")
|
12 |
+
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0002-install-options.patch
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt
|
2 |
+
+++ b/CMakeLists.txt
|
3 |
+
@@ -607,7 +607,7 @@ endif()
|
4 |
+
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
|
5 |
+
|
6 |
+
# --- Python Support ---
|
7 |
+
-if(NOT IOS)
|
8 |
+
+if(WITH_PYTHON)
|
9 |
+
include(cmake/OpenCVDetectPython.cmake)
|
10 |
+
endif()
|
11 |
+
|
12 |
+
--- a/cmake/OpenCVCompilerOptions.cmake
|
13 |
+
+++ b/cmake/OpenCVCompilerOptions.cmake
|
14 |
+
@@ -284,7 +284,6 @@ if(MSVC)
|
15 |
+
#endif()
|
16 |
+
|
17 |
+
if(BUILD_WITH_DEBUG_INFO)
|
18 |
+
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
|
19 |
+
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
|
20 |
+
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
|
21 |
+
set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
|
22 |
+
--- a/cmake/OpenCVGenConfig.cmake
|
23 |
+
+++ b/cmake/OpenCVGenConfig.cmake
|
24 |
+
@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
|
25 |
+
endif()
|
26 |
+
endfunction()
|
27 |
+
|
28 |
+
-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
|
29 |
+
+if(TRUE)
|
30 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
|
31 |
+
endif()
|
32 |
+
|
33 |
+
-if(ANDROID)
|
34 |
+
+if(FALSE)
|
35 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in")
|
36 |
+
install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev)
|
37 |
+
endif()
|
38 |
+
@@ -121,7 +121,7 @@ endif()
|
39 |
+
# --------------------------------------------------------------------------------------------
|
40 |
+
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
|
41 |
+
# --------------------------------------------------------------------------------------------
|
42 |
+
-if(WIN32)
|
43 |
+
+if(FALSE)
|
44 |
+
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
|
45 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
|
46 |
+
"${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
|
47 |
+
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
48 |
+
index 1f0d720..0bb1ff7 100644
|
49 |
+
--- a/data/CMakeLists.txt
|
50 |
+
+++ b/data/CMakeLists.txt
|
51 |
+
@@ -1,8 +1,6 @@
|
52 |
+
file(GLOB HAAR_CASCADES haarcascades/*.xml)
|
53 |
+
file(GLOB LBP_CASCADES lbpcascades/*.xml)
|
54 |
+
|
55 |
+
-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
|
56 |
+
-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs)
|
57 |
+
|
58 |
+
if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
|
59 |
+
install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0003-force-package-requirements.patch
ADDED
@@ -0,0 +1,83 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
2 |
+
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
3 |
+
@@ -11,7 +11,7 @@ else()
|
4 |
+
set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
5 |
+
set(CMAKE_FIND_LIBRARY_SUFFIXES .so)
|
6 |
+
endif()
|
7 |
+
- find_package(ZLIB "${MIN_VER_ZLIB}")
|
8 |
+
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
|
9 |
+
if(ANDROID)
|
10 |
+
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
|
11 |
+
unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
|
12 |
+
@@ -41,7 +41,7 @@ if(WITH_JPEG)
|
13 |
+
ocv_clear_vars(JPEG_FOUND)
|
14 |
+
else()
|
15 |
+
ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR)
|
16 |
+
- include(FindJPEG)
|
17 |
+
+ find_package(JPEG REQUIRED)
|
18 |
+
endif()
|
19 |
+
|
20 |
+
if(NOT JPEG_FOUND)
|
21 |
+
@@ -87,7 +87,7 @@ if(WITH_TIFF)
|
22 |
+
ocv_clear_vars(TIFF_FOUND)
|
23 |
+
else()
|
24 |
+
ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR)
|
25 |
+
- include(FindTIFF)
|
26 |
+
+ find_package(TIFF REQUIRED)
|
27 |
+
if(TIFF_FOUND)
|
28 |
+
ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
|
29 |
+
endif()
|
30 |
+
@@ -131,7 +131,7 @@ if(WITH_WEBP)
|
31 |
+
ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
|
32 |
+
else()
|
33 |
+
ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
|
34 |
+
- include(cmake/OpenCVFindWebP.cmake)
|
35 |
+
+ find_package(WebP REQUIRED)
|
36 |
+
if(WEBP_FOUND)
|
37 |
+
set(HAVE_WEBP 1)
|
38 |
+
endif()
|
39 |
+
@@ -172,7 +172,7 @@ if(WITH_JASPER)
|
40 |
+
if(BUILD_JASPER)
|
41 |
+
ocv_clear_vars(JASPER_FOUND)
|
42 |
+
else()
|
43 |
+
- include(FindJasper)
|
44 |
+
+ find_package(Jasper REQUIRED)
|
45 |
+
endif()
|
46 |
+
|
47 |
+
if(NOT JASPER_FOUND)
|
48 |
+
@@ -197,7 +197,7 @@ if(WITH_PNG)
|
49 |
+
ocv_clear_vars(PNG_FOUND)
|
50 |
+
else()
|
51 |
+
ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
|
52 |
+
- include(FindPNG)
|
53 |
+
+ find_package(PNG REQUIRED)
|
54 |
+
if(PNG_FOUND)
|
55 |
+
include(CheckIncludeFile)
|
56 |
+
check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
|
57 |
+
@@ -229,7 +229,7 @@ if(WITH_OPENEXR)
|
58 |
+
ocv_clear_vars(HAVE_OPENEXR)
|
59 |
+
if(NOT BUILD_OPENEXR)
|
60 |
+
ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
|
61 |
+
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
62 |
+
+ find_package(OpenEXR REQUIRED)
|
63 |
+
endif()
|
64 |
+
|
65 |
+
if(OPENEXR_FOUND)
|
66 |
+
@@ -247,7 +247,7 @@ endif()
|
67 |
+
|
68 |
+
# --- GDAL (optional) ---
|
69 |
+
if(WITH_GDAL)
|
70 |
+
- find_package(GDAL QUIET)
|
71 |
+
+ find_package(GDAL REQUIRED)
|
72 |
+
|
73 |
+
if(NOT GDAL_FOUND)
|
74 |
+
set(HAVE_GDAL NO)
|
75 |
+
@@ -259,7 +259,7 @@ if(WITH_GDAL)
|
76 |
+
endif()
|
77 |
+
|
78 |
+
if(WITH_GDCM)
|
79 |
+
- find_package(GDCM QUIET)
|
80 |
+
+ find_package(GDCM REQUIRED)
|
81 |
+
if(NOT GDCM_FOUND)
|
82 |
+
set(HAVE_GDCM NO)
|
83 |
+
ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0004-fix-eigen.patch
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVFindLibsPerf.cmake
|
2 |
+
+++ b/cmake/OpenCVFindLibsPerf.cmake
|
3 |
+
@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN)
|
4 |
+
OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+
|
5 |
+
) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG
|
6 |
+
)
|
7 |
+
- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING)
|
8 |
+
+ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING)
|
9 |
+
endif()
|
10 |
+
if(NOT Eigen3_FOUND)
|
11 |
+
find_package(Eigen3 QUIET)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0005-fix-vtk9.patch
ADDED
@@ -0,0 +1,466 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVDetectVTK.cmake
|
2 |
+
+++ b/cmake/OpenCVDetectVTK.cmake
|
3 |
+
@@ -1,12 +1,30 @@
|
4 |
+
+# VTK 9.0
|
5 |
+
+if(NOT VTK_FOUND)
|
6 |
+
+ find_package(VTK 9 QUIET NAMES vtk COMPONENTS
|
7 |
+
+ FiltersExtraction
|
8 |
+
+ FiltersSources
|
9 |
+
+ FiltersTexture
|
10 |
+
+ IOExport
|
11 |
+
+ IOGeometry
|
12 |
+
+ IOPLY
|
13 |
+
+ InteractionStyle
|
14 |
+
+ RenderingCore
|
15 |
+
+ RenderingLOD
|
16 |
+
+ RenderingOpenGL2
|
17 |
+
+ NO_MODULE)
|
18 |
+
+endif()
|
19 |
+
+
|
20 |
+
# VTK 6.x components
|
21 |
+
-find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
|
22 |
+
-IF(VTK_FOUND)
|
23 |
+
- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
|
24 |
+
+if(NOT VTK_FOUND)
|
25 |
+
+ find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
|
26 |
+
+ IF(VTK_FOUND)
|
27 |
+
+ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
|
28 |
+
find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
|
29 |
+
- ELSE(VTK_RENDERING_BACKEND)
|
30 |
+
+ ELSE(VTK_RENDERING_BACKEND)
|
31 |
+
find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
|
32 |
+
- ENDIF(VTK_RENDERING_BACKEND)
|
33 |
+
-ENDIF(VTK_FOUND)
|
34 |
+
+ ENDIF(VTK_RENDERING_BACKEND)
|
35 |
+
+ ENDIF(VTK_FOUND)
|
36 |
+
+endif()
|
37 |
+
|
38 |
+
# VTK 5.x components
|
39 |
+
if(NOT VTK_FOUND)
|
40 |
+
diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt
|
41 |
+
index 256b464..92698c3 100644
|
42 |
+
--- a/modules/viz/CMakeLists.txt
|
43 |
+
+++ b/modules/viz/CMakeLists.txt
|
44 |
+
@@ -3,7 +3,6 @@ if(NOT HAVE_VTK)
|
45 |
+
endif()
|
46 |
+
|
47 |
+
set(the_description "Viz")
|
48 |
+
-include(${VTK_USE_FILE})
|
49 |
+
|
50 |
+
if(NOT BUILD_SHARED_LIBS)
|
51 |
+
# We observed conflict between builtin 3rdparty libraries and
|
52 |
+
@@ -27,7 +26,14 @@ endif()
|
53 |
+
ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override)
|
54 |
+
|
55 |
+
ocv_define_module(viz opencv_core WRAP python)
|
56 |
+
-ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES})
|
57 |
+
+
|
58 |
+
+if (VTK_VERSION VERSION_LESS "8.90.0")
|
59 |
+
+ include(${VTK_USE_FILE})
|
60 |
+
+ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES})
|
61 |
+
+else ()
|
62 |
+
+ ocv_target_link_libraries(${the_module} PRIVATE ${VTK_LIBRARIES})
|
63 |
+
+ vtk_module_autoinit(TARGETS ${the_module} MODULES ${VTK_LIBRARIES})
|
64 |
+
+endif()
|
65 |
+
|
66 |
+
if(APPLE AND BUILD_opencv_viz)
|
67 |
+
ocv_target_link_libraries(${the_module} PRIVATE "-framework Cocoa")
|
68 |
+
diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp
|
69 |
+
index f92fdb6..4c4bf7c 100644
|
70 |
+
--- a/modules/viz/src/precomp.hpp
|
71 |
+
+++ b/modules/viz/src/precomp.hpp
|
72 |
+
@@ -133,7 +133,8 @@
|
73 |
+
#include <vtkColorTransferFunction.h>
|
74 |
+
#include <vtkStreamingDemandDrivenPipeline.h>
|
75 |
+
#include <vtkLight.h>
|
76 |
+
-#include "vtkCallbackCommand.h"
|
77 |
+
+#include <vtkCallbackCommand.h>
|
78 |
+
+#include <vtkVersion.h>
|
79 |
+
|
80 |
+
#if !defined(_WIN32) || defined(__CYGWIN__)
|
81 |
+
# include <unistd.h> /* unlink */
|
82 |
+
@@ -149,6 +150,11 @@
|
83 |
+
#include "vtk/vtkTrajectorySource.h"
|
84 |
+
#include "vtk/vtkImageMatSource.h"
|
85 |
+
|
86 |
+
+#if VTK_MAJOR_VERSION >= 9
|
87 |
+
+typedef vtkIdType const * CellIterT;
|
88 |
+
+#else
|
89 |
+
+typedef vtkIdType * CellIterT;
|
90 |
+
+#endif
|
91 |
+
|
92 |
+
#include <opencv2/core.hpp>
|
93 |
+
#include <opencv2/viz.hpp>
|
94 |
+
diff --git a/modules/viz/src/types.cpp b/modules/viz/src/types.cpp
|
95 |
+
index 65571a1..e9a470c 100644
|
96 |
+
--- a/modules/viz/src/types.cpp
|
97 |
+
+++ b/modules/viz/src/types.cpp
|
98 |
+
@@ -97,10 +97,12 @@ cv::viz::Mesh cv::viz::Mesh::load(const String& file, int type)
|
99 |
+
// Now handle the polygons
|
100 |
+
vtkSmartPointer<vtkCellArray> polygons = polydata->GetPolys();
|
101 |
+
mesh.polygons.create(1, polygons->GetSize(), CV_32SC1);
|
102 |
+
+ mesh.polygons = 0;
|
103 |
+
int* poly_ptr = mesh.polygons.ptr<int>();
|
104 |
+
|
105 |
+
polygons->InitTraversal();
|
106 |
+
- vtkIdType nr_cell_points, *cell_points;
|
107 |
+
+ vtkIdType nr_cell_points;
|
108 |
+
+ CellIterT cell_points;
|
109 |
+
while (polygons->GetNextCell(nr_cell_points, cell_points))
|
110 |
+
{
|
111 |
+
*poly_ptr++ = nr_cell_points;
|
112 |
+
--- a/modules/viz/src/vizimpl.cpp
|
113 |
+
+++ b/modules/viz/src/vizimpl.cpp
|
114 |
+
@@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false),
|
115 |
+
|
116 |
+
// Create render window
|
117 |
+
window_ = vtkSmartPointer<vtkRenderWindow>::New();
|
118 |
+
- cv::Vec2i window_size = cv::Vec2i(window_->GetScreenSize()) / 2;
|
119 |
+
- window_->SetSize(window_size.val);
|
120 |
+
+ int * sz = window_->GetScreenSize();
|
121 |
+
+ if (sz)
|
122 |
+
+ {
|
123 |
+
+ cv::Vec2i window_size = cv::Vec2i(sz) / 2;
|
124 |
+
+ window_->SetSize(window_size.val);
|
125 |
+
+ }
|
126 |
+
+ else
|
127 |
+
+ {
|
128 |
+
+ int new_sz[2] = { 640, 480 };
|
129 |
+
+ window_->SetSize(new_sz);
|
130 |
+
+ }
|
131 |
+
window_->AddRenderer(renderer_);
|
132 |
+
|
133 |
+
// Create the interactor style
|
134 |
+
--- a/modules/viz/src/vtk/vtkOBJWriter.cpp
|
135 |
+
+++ b/modules/viz/src/vtk/vtkOBJWriter.cpp
|
136 |
+
@@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData()
|
137 |
+
}
|
138 |
+
|
139 |
+
vtkDebugMacro(<<"Opening vtk file for writing...");
|
140 |
+
- ostream *outfilep = new ofstream(this->FileName, ios::out);
|
141 |
+
+ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out);
|
142 |
+
if (outfilep->fail())
|
143 |
+
{
|
144 |
+
vtkErrorMacro(<< "Unable to open file: "<< this->FileName);
|
145 |
+
@@ -127,7 +127,8 @@ void cv::viz::vtkOBJWriter::WriteData()
|
146 |
+
// write out verts if any
|
147 |
+
if (input->GetNumberOfVerts() > 0)
|
148 |
+
{
|
149 |
+
- vtkIdType npts = 0, *index = 0;
|
150 |
+
+ vtkIdType npts = 0;
|
151 |
+
+ CellIterT index = 0;
|
152 |
+
vtkCellArray *cells = input->GetVerts();
|
153 |
+
for (cells->InitTraversal(); cells->GetNextCell(npts, index); )
|
154 |
+
{
|
155 |
+
@@ -141,7 +142,8 @@ void cv::viz::vtkOBJWriter::WriteData()
|
156 |
+
// write out lines if any
|
157 |
+
if (input->GetNumberOfLines() > 0)
|
158 |
+
{
|
159 |
+
- vtkIdType npts = 0, *index = 0;
|
160 |
+
+ vtkIdType npts = 0;
|
161 |
+
+ CellIterT index = 0;
|
162 |
+
vtkCellArray *cells = input->GetLines();
|
163 |
+
for (cells->InitTraversal(); cells->GetNextCell(npts, index); )
|
164 |
+
{
|
165 |
+
@@ -162,7 +164,8 @@ void cv::viz::vtkOBJWriter::WriteData()
|
166 |
+
// write out polys if any
|
167 |
+
if (input->GetNumberOfPolys() > 0)
|
168 |
+
{
|
169 |
+
- vtkIdType npts = 0, *index = 0;
|
170 |
+
+ vtkIdType npts = 0;
|
171 |
+
+ CellIterT index = 0;
|
172 |
+
vtkCellArray *cells = input->GetPolys();
|
173 |
+
for (cells->InitTraversal(); cells->GetNextCell(npts, index); )
|
174 |
+
{
|
175 |
+
@@ -191,7 +194,8 @@ void cv::viz::vtkOBJWriter::WriteData()
|
176 |
+
// write out tstrips if any
|
177 |
+
if (input->GetNumberOfStrips() > 0)
|
178 |
+
{
|
179 |
+
- vtkIdType npts = 0, *index = 0;
|
180 |
+
+ vtkIdType npts = 0;
|
181 |
+
+ CellIterT index = 0;
|
182 |
+
vtkCellArray *cells = input->GetStrips();
|
183 |
+
for (cells->InitTraversal(); cells->GetNextCell(npts, index); )
|
184 |
+
{
|
185 |
+
--- a/modules/viz/src/vtk/vtkXYZReader.cpp
|
186 |
+
+++ b/modules/viz/src/vtk/vtkXYZReader.cpp
|
187 |
+
@@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**,
|
188 |
+
}
|
189 |
+
|
190 |
+
// Open the input file.
|
191 |
+
- ifstream fin(this->FileName);
|
192 |
+
+ std::ifstream fin(this->FileName);
|
193 |
+
if(!fin)
|
194 |
+
{
|
195 |
+
vtkErrorMacro("Error opening file " << this->FileName);
|
196 |
+
--- a/modules/viz/src/vtk/vtkXYZWriter.cpp
|
197 |
+
+++ b/modules/viz/src/vtk/vtkXYZWriter.cpp
|
198 |
+
@@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData()
|
199 |
+
}
|
200 |
+
|
201 |
+
vtkDebugMacro(<<"Opening vtk file for writing...");
|
202 |
+
- ostream *outfilep = new ofstream(this->FileName, ios::out);
|
203 |
+
+ std::ostream *outfilep = new std::ofstream(this->FileName, ios::out);
|
204 |
+
if (outfilep->fail())
|
205 |
+
{
|
206 |
+
vtkErrorMacro(<< "Unable to open file: "<< this->FileName);
|
207 |
+
--- a/modules/viz/test/test_tutorial2.cpp
|
208 |
+
+++ b/modules/viz/test/test_tutorial2.cpp
|
209 |
+
@@ -28,7 +28,7 @@ static void tutorial2()
|
210 |
+
/// Rodrigues vector
|
211 |
+
Vec3d rot_vec = Vec3d::all(0);
|
212 |
+
double translation_phase = 0.0, translation = 0.0;
|
213 |
+
- while(!myWindow.wasStopped())
|
214 |
+
+ for(unsigned num = 0; num < 50; ++num)
|
215 |
+
{
|
216 |
+
/* Rotation using rodrigues */
|
217 |
+
/// Rotate around (1,1,1)
|
218 |
+
@@ -45,7 +45,7 @@ static void tutorial2()
|
219 |
+
|
220 |
+
myWindow.setWidgetPose("Cube Widget", pose);
|
221 |
+
|
222 |
+
- myWindow.spinOnce(1, true);
|
223 |
+
+ myWindow.spinOnce(100, true);
|
224 |
+
}
|
225 |
+
}
|
226 |
+
|
227 |
+
--- a/modules/viz/test/test_tutorial3.cpp
|
228 |
+
+++ b/modules/viz/test/test_tutorial3.cpp
|
229 |
+
@@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov)
|
230 |
+
myWindow.setViewerPose(camera_pose);
|
231 |
+
|
232 |
+
/// Start event loop.
|
233 |
+
- myWindow.spin();
|
234 |
+
+ myWindow.spinOnce(500, true);
|
235 |
+
}
|
236 |
+
|
237 |
+
TEST(Viz, tutorial3_global_view)
|
238 |
+
--- a/modules/viz/test/test_viz3d.cpp
|
239 |
+
+++ b/modules/viz/test/test_viz3d.cpp
|
240 |
+
@@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop)
|
241 |
+
//cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path());
|
242 |
+
//---->>>>> </to_test_in_future>
|
243 |
+
|
244 |
+
- viz.spin();
|
245 |
+
+ viz.spinOnce(500, true);
|
246 |
+
}
|
247 |
+
|
248 |
+
}} // namespace
|
249 |
+
--- a/modules/viz/test/tests_simple.cpp
|
250 |
+
+++ b/modules/viz/test/tests_simple.cpp
|
251 |
+
@@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry)
|
252 |
+
viz.showWidget("dragon", WCloud(dragon_cloud, Color::bluberry()), pose);
|
253 |
+
|
254 |
+
viz.showWidget("text2d", WText("Bluberry cloud", Point(20, 20), 20, Color::green()));
|
255 |
+
- viz.spin();
|
256 |
+
+ viz.spinOnce(500, true);
|
257 |
+
}
|
258 |
+
|
259 |
+
TEST(Viz, show_cloud_random_color)
|
260 |
+
@@ -73,7 +73,7 @@ TEST(Viz, show_cloud_random_color)
|
261 |
+
viz.showWidget("coosys", WCoordinateSystem());
|
262 |
+
viz.showWidget("dragon", WCloud(dragon_cloud, colors), pose);
|
263 |
+
viz.showWidget("text2d", WText("Random color cloud", Point(20, 20), 20, Color::green()));
|
264 |
+
- viz.spin();
|
265 |
+
+ viz.spinOnce(500, true);
|
266 |
+
}
|
267 |
+
|
268 |
+
TEST(Viz, show_cloud_masked)
|
269 |
+
@@ -91,7 +91,7 @@ TEST(Viz, show_cloud_masked)
|
270 |
+
viz.showWidget("coosys", WCoordinateSystem());
|
271 |
+
viz.showWidget("dragon", WCloud(dragon_cloud), pose);
|
272 |
+
viz.showWidget("text2d", WText("Nan masked cloud", Point(20, 20), 20, Color::green()));
|
273 |
+
- viz.spin();
|
274 |
+
+ viz.spinOnce(500, true);
|
275 |
+
}
|
276 |
+
|
277 |
+
TEST(Viz, show_cloud_collection)
|
278 |
+
@@ -109,7 +109,7 @@ TEST(Viz, show_cloud_collection)
|
279 |
+
viz.showWidget("coosys", WCoordinateSystem());
|
280 |
+
viz.showWidget("ccol", ccol);
|
281 |
+
viz.showWidget("text2d", WText("Cloud collection", Point(20, 20), 20, Color::green()));
|
282 |
+
- viz.spin();
|
283 |
+
+ viz.spinOnce(500, true);
|
284 |
+
}
|
285 |
+
|
286 |
+
TEST(Viz, show_painted_clouds)
|
287 |
+
@@ -124,7 +124,7 @@ TEST(Viz, show_painted_clouds)
|
288 |
+
viz.showWidget("cloud3", WPaintedCloud(cloud, Vec3d(0.0, 0.0, -1.0), Vec3d(0.0, 0.0, 1.0), Color::blue(), Color::red()));
|
289 |
+
viz.showWidget("arrow", WArrow(Vec3d(0.0, 1.0, -1.0), Vec3d(0.0, 1.0, 1.0), 0.009, Color::raspberry()));
|
290 |
+
viz.showWidget("text2d", WText("Painted clouds", Point(20, 20), 20, Color::green()));
|
291 |
+
- viz.spin();
|
292 |
+
+ viz.spinOnce(500, true);
|
293 |
+
}
|
294 |
+
|
295 |
+
TEST(Viz, show_mesh)
|
296 |
+
@@ -137,7 +137,7 @@ TEST(Viz, show_mesh)
|
297 |
+
viz.showWidget("coosys", WCoordinateSystem());
|
298 |
+
viz.showWidget("mesh", WMesh(mesh), pose);
|
299 |
+
viz.showWidget("text2d", WText("Just mesh", Point(20, 20), 20, Color::green()));
|
300 |
+
- viz.spin();
|
301 |
+
+ viz.spinOnce(500, true);
|
302 |
+
}
|
303 |
+
|
304 |
+
TEST(Viz, show_mesh_random_colors)
|
305 |
+
@@ -152,7 +152,7 @@ TEST(Viz, show_mesh_random_colors)
|
306 |
+
viz.showWidget("mesh", WMesh(mesh), pose);
|
307 |
+
viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG);
|
308 |
+
viz.showWidget("text2d", WText("Random color mesh", Point(20, 20), 20, Color::green()));
|
309 |
+
- viz.spin();
|
310 |
+
+ viz.spinOnce(500, true);
|
311 |
+
}
|
312 |
+
|
313 |
+
TEST(Viz, show_widget_merger)
|
314 |
+
@@ -173,7 +173,7 @@ TEST(Viz, show_widget_merger)
|
315 |
+
viz.showWidget("coo", WCoordinateSystem());
|
316 |
+
viz.showWidget("merger", merger);
|
317 |
+
viz.showWidget("text2d", WText("Widget merger", Point(20, 20), 20, Color::green()));
|
318 |
+
- viz.spin();
|
319 |
+
+ viz.spinOnce(500, true);
|
320 |
+
}
|
321 |
+
|
322 |
+
TEST(Viz, show_textured_mesh)
|
323 |
+
@@ -210,7 +210,7 @@ TEST(Viz, show_textured_mesh)
|
324 |
+
viz.showWidget("mesh", WMesh(mesh));
|
325 |
+
viz.setRenderingProperty("mesh", SHADING, SHADING_PHONG);
|
326 |
+
viz.showWidget("text2d", WText("Textured mesh", Point(20, 20), 20, Color::green()));
|
327 |
+
- viz.spin();
|
328 |
+
+ viz.spinOnce(500, true);
|
329 |
+
}
|
330 |
+
|
331 |
+
TEST(Viz, show_polyline)
|
332 |
+
@@ -229,7 +229,7 @@ TEST(Viz, show_polyline)
|
333 |
+
viz.showWidget("polyline", WPolyLine(polyline, colors));
|
334 |
+
viz.showWidget("coosys", WCoordinateSystem());
|
335 |
+
viz.showWidget("text2d", WText("Polyline", Point(20, 20), 20, Color::green()));
|
336 |
+
- viz.spin();
|
337 |
+
+ viz.spinOnce(500, true);
|
338 |
+
}
|
339 |
+
|
340 |
+
TEST(Viz, show_sampled_normals)
|
341 |
+
@@ -244,7 +244,7 @@ TEST(Viz, show_sampled_normals)
|
342 |
+
viz.showWidget("normals", WCloudNormals(mesh.cloud, mesh.normals, 30, 0.1f, Color::green()), pose);
|
343 |
+
viz.setRenderingProperty("normals", LINE_WIDTH, 2.0);
|
344 |
+
viz.showWidget("text2d", WText("Cloud or mesh normals", Point(20, 20), 20, Color::green()));
|
345 |
+
- viz.spin();
|
346 |
+
+ viz.spinOnce(500, true);
|
347 |
+
}
|
348 |
+
|
349 |
+
TEST(Viz, show_cloud_shaded_by_normals)
|
350 |
+
@@ -260,7 +260,7 @@ TEST(Viz, show_cloud_shaded_by_normals)
|
351 |
+
Viz3d viz("show_cloud_shaded_by_normals");
|
352 |
+
viz.showWidget("cloud", cloud, pose);
|
353 |
+
viz.showWidget("text2d", WText("Cloud shaded by normals", Point(20, 20), 20, Color::green()));
|
354 |
+
- viz.spin();
|
355 |
+
+ viz.spinOnce(500, true);
|
356 |
+
}
|
357 |
+
|
358 |
+
TEST(Viz, show_trajectories)
|
359 |
+
@@ -287,15 +287,15 @@ TEST(Viz, show_trajectories)
|
360 |
+
viz.showWidget("text2d", WText("Different kinds of supported trajectories", Point(20, 20), 20, Color::green()));
|
361 |
+
|
362 |
+
int i = 0;
|
363 |
+
- while(!viz.wasStopped())
|
364 |
+
+ for(unsigned num = 0; num < 50; ++num)
|
365 |
+
{
|
366 |
+
double a = --i % 360;
|
367 |
+
Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180));
|
368 |
+
viz.setViewerPose(makeCameraPose(pose * 7.5, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0)));
|
369 |
+
- viz.spinOnce(20, true);
|
370 |
+
+ viz.spinOnce(100, true);
|
371 |
+
}
|
372 |
+
viz.resetCamera();
|
373 |
+
- viz.spin();
|
374 |
+
+ viz.spinOnce(500, true);
|
375 |
+
}
|
376 |
+
|
377 |
+
TEST(Viz, show_trajectory_reposition)
|
378 |
+
@@ -306,7 +306,7 @@ TEST(Viz, show_trajectory_reposition)
|
379 |
+
viz.showWidget("coos", WCoordinateSystem());
|
380 |
+
viz.showWidget("sub3", WTrajectory(Mat(path).rowRange(0, (int)path.size()/3), WTrajectory::BOTH, 0.2, Color::brown()), path.front().inv());
|
381 |
+
viz.showWidget("text2d", WText("Trajectory resposition to origin", Point(20, 20), 20, Color::green()));
|
382 |
+
- viz.spin();
|
383 |
+
+ viz.spinOnce(500, true);
|
384 |
+
}
|
385 |
+
|
386 |
+
TEST(Viz, show_camera_positions)
|
387 |
+
@@ -330,7 +330,7 @@ TEST(Viz, show_camera_positions)
|
388 |
+
viz.showWidget("pos3", WCameraPosition(0.75), poses[1]);
|
389 |
+
viz.showWidget("pos4", WCameraPosition(K, gray, 3, Color::indigo()), poses[1]);
|
390 |
+
viz.showWidget("text2d", WText("Camera positions with images", Point(20, 20), 20, Color::green()));
|
391 |
+
- viz.spin();
|
392 |
+
+ viz.spinOnce(500, true);
|
393 |
+
}
|
394 |
+
|
395 |
+
TEST(Viz, show_overlay_image)
|
396 |
+
@@ -353,16 +353,16 @@ TEST(Viz, show_overlay_image)
|
397 |
+
viz.showWidget("text2d", WText("Overlay images", Point(20, 20), 20, Color::green()));
|
398 |
+
|
399 |
+
int i = 0;
|
400 |
+
- while(!viz.wasStopped())
|
401 |
+
+ for(unsigned num = 0; num < 50; ++num)
|
402 |
+
{
|
403 |
+
double a = ++i % 360;
|
404 |
+
Vec3d pose(sin(a * CV_PI/180), 0.7, cos(a * CV_PI/180));
|
405 |
+
viz.setViewerPose(makeCameraPose(pose * 3, Vec3d(0.0, 0.5, 0.0), Vec3d(0.0, 0.1, 0.0)));
|
406 |
+
viz.getWidget("img1").cast<WImageOverlay>().setImage(lena * pow(sin(i*10*CV_PI/180) * 0.5 + 0.5, 1.0));
|
407 |
+
- viz.spinOnce(1, true);
|
408 |
+
+ viz.spinOnce(100, true);
|
409 |
+
}
|
410 |
+
viz.showWidget("text2d", WText("Overlay images (stopped)", Point(20, 20), 20, Color::green()));
|
411 |
+
- viz.spin();
|
412 |
+
+ viz.spinOnce(500, true);
|
413 |
+
}
|
414 |
+
|
415 |
+
|
416 |
+
@@ -376,7 +376,7 @@ TEST(Viz, show_image_method)
|
417 |
+
viz.showImage(lena, lena.size());
|
418 |
+
viz.spinOnce(1500, true);
|
419 |
+
|
420 |
+
- cv::viz::imshow("show_image_method", make_gray(lena)).spin();
|
421 |
+
+ cv::viz::imshow("show_image_method", make_gray(lena)).spinOnce(500, true);
|
422 |
+
}
|
423 |
+
|
424 |
+
TEST(Viz, show_image_3d)
|
425 |
+
@@ -398,13 +398,13 @@ TEST(Viz, show_image_3d)
|
426 |
+
viz.showWidget("text2d", WText("Images in 3D", Point(20, 20), 20, Color::green()));
|
427 |
+
|
428 |
+
int i = 0;
|
429 |
+
- while(!viz.wasStopped())
|
430 |
+
+ for(unsigned num = 0; num < 50; ++num)
|
431 |
+
{
|
432 |
+
viz.getWidget("img0").cast<WImage3D>().setImage(lena * pow(sin(i++*7.5*CV_PI/180) * 0.5 + 0.5, 1.0));
|
433 |
+
- viz.spinOnce(1, true);
|
434 |
+
+ viz.spinOnce(100, true);
|
435 |
+
}
|
436 |
+
viz.showWidget("text2d", WText("Images in 3D (stopped)", Point(20, 20), 20, Color::green()));
|
437 |
+
- viz.spin();
|
438 |
+
+ viz.spinOnce(500, true);
|
439 |
+
}
|
440 |
+
|
441 |
+
TEST(Viz, show_simple_widgets)
|
442 |
+
@@ -431,10 +431,10 @@ TEST(Viz, show_simple_widgets)
|
443 |
+
|
444 |
+
viz.showWidget("grid1", WGrid(Vec2i(7,7), Vec2d::all(0.75), Color::gray()), Affine3d().translate(Vec3d(0.0, 0.0, -1.0)));
|
445 |
+
|
446 |
+
- viz.spin();
|
447 |
+
+ viz.spinOnce(500, true);
|
448 |
+
viz.getWidget("text2d").cast<WText>().setText("Different simple widgets (updated)");
|
449 |
+
viz.getWidget("text3d").cast<WText3D>().setText("Updated text 3D");
|
450 |
+
- viz.spin();
|
451 |
+
+ viz.spinOnce(500, true);
|
452 |
+
}
|
453 |
+
|
454 |
+
TEST(Viz, show_follower)
|
455 |
+
@@ -446,9 +446,9 @@ TEST(Viz, show_follower)
|
456 |
+
viz.showWidget("t3d_2", WText3D("Simple 3D follower", Point3d(-0.5, -0.5, 0.5), 0.125, true, Color::green()));
|
457 |
+
viz.showWidget("text2d", WText("Follower: text always facing camera", Point(20, 20), 20, Color::green()));
|
458 |
+
viz.setBackgroundMeshLab();
|
459 |
+
- viz.spin();
|
460 |
+
+ viz.spinOnce(500, true);
|
461 |
+
viz.getWidget("t3d_2").cast<WText3D>().setText("Updated follower 3D");
|
462 |
+
- viz.spin();
|
463 |
+
+ viz.spinOnce(500, true);
|
464 |
+
}
|
465 |
+
|
466 |
+
}} // namespace
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0006-fix-uwp.patch
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVModule.cmake
|
2 |
+
+++ b/cmake/OpenCVModule.cmake
|
3 |
+
@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests)
|
4 |
+
set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
|
5 |
+
endif()
|
6 |
+
|
7 |
+
- if(WINRT)
|
8 |
+
+ if(WINRT AND BUILD_TESTS)
|
9 |
+
# removing APPCONTAINER from tests to run from console
|
10 |
+
# look for detailed description inside of ocv_create_module macro above
|
11 |
+
add_custom_command(TARGET "opencv_perf_${name}"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0007-fix-hdf5.patch
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/modules/hdf/CMakeLists.txt
|
2 |
+
+++ b/modules/hdf/CMakeLists.txt
|
3 |
+
@@ -1,25 +1,8 @@
|
4 |
+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
|
5 |
+
|
6 |
+
-if(WIN32)
|
7 |
+
- # windows cmake internal lookups are broken for now
|
8 |
+
- # will lookup for headers and shared libs given HDF_DIR env
|
9 |
+
- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include")
|
10 |
+
- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib")
|
11 |
+
- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY)
|
12 |
+
- set(HDF5_FOUND "YES")
|
13 |
+
- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY})
|
14 |
+
- mark_as_advanced(HDF5_LIBRARIES)
|
15 |
+
- mark_as_advanced(HDF5_C_LIBRARY)
|
16 |
+
- mark_as_advanced(HDF5_INCLUDE_DIRS)
|
17 |
+
- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_)
|
18 |
+
- else()
|
19 |
+
- set(HDF5_FOUND "NO")
|
20 |
+
- endif()
|
21 |
+
-else()
|
22 |
+
if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package
|
23 |
+
find_package(HDF5)
|
24 |
+
endif()
|
25 |
+
-endif()
|
26 |
+
|
27 |
+
if(NOT HDF5_FOUND)
|
28 |
+
ocv_module_disable(hdf) # no return
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0008-devendor-quirc.patch
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt
|
2 |
+
+++ b/CMakeLists.txt
|
3 |
+
@@ -778,7 +778,7 @@ if(WITH_OPENVX)
|
4 |
+
endif()
|
5 |
+
|
6 |
+
if(WITH_QUIRC)
|
7 |
+
- add_subdirectory(3rdparty/quirc)
|
8 |
+
+ find_package(quirc CONFIG REQUIRED)
|
9 |
+
set(HAVE_QUIRC TRUE)
|
10 |
+
endif()
|
11 |
+
# ----------------------------------------------------------------------------
|
12 |
+
--- a/modules/objdetect/CMakeLists.txt
|
13 |
+
+++ b/modules/objdetect/CMakeLists.txt
|
14 |
+
@@ -2,7 +2,5 @@ set(the_description "Object Detection")
|
15 |
+
ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js)
|
16 |
+
|
17 |
+
if(HAVE_QUIRC)
|
18 |
+
- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
|
19 |
+
- ocv_include_directories(${QUIRC_INCLUDE})
|
20 |
+
- ocv_target_link_libraries(${the_module} quirc)
|
21 |
+
+ ocv_target_link_libraries(${the_module} quirc::quirc)
|
22 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0009-fix-protobuf.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVFindProtobuf.cmake
|
2 |
+
+++ b/cmake/OpenCVFindProtobuf.cmake
|
3 |
+
@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
|
4 |
+
set(HAVE_PROTOBUF TRUE)
|
5 |
+
else()
|
6 |
+
unset(Protobuf_VERSION CACHE)
|
7 |
+
- find_package(Protobuf QUIET)
|
8 |
+
+ find_package(Protobuf CONFIG REQUIRED)
|
9 |
+
|
10 |
+
# Backwards compatibility
|
11 |
+
# Define camel case versions of input variables
|
12 |
+
@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF)
|
13 |
+
if(NOT BUILD_PROTOBUF)
|
14 |
+
if(TARGET "${Protobuf_LIBRARIES}")
|
15 |
+
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE)
|
16 |
+
+ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG)
|
17 |
+
if(NOT __location)
|
18 |
+
get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION)
|
19 |
+
endif()
|
20 |
+
@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF)
|
21 |
+
endif()
|
22 |
+
list(APPEND CUSTOM_STATUS_protobuf " Protobuf:"
|
23 |
+
BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})"
|
24 |
+
- ELSE "${__location} (${Protobuf_VERSION})")
|
25 |
+
+ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})")
|
26 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/modules/imgcodecs/CMakeLists.txt
|
2 |
+
+++ b/modules/imgcodecs/CMakeLists.txt
|
3 |
+
@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python)
|
4 |
+
|
5 |
+
ocv_clear_vars(GRFMT_LIBS)
|
6 |
+
|
7 |
+
+if(MSVC)
|
8 |
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
|
9 |
+
+endif()
|
10 |
+
+
|
11 |
+
if(HAVE_WINRT_CX AND NOT WINRT)
|
12 |
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
|
13 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0011-remove-python2.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVDetectPython.cmake
|
2 |
+
+++ b/cmake/OpenCVDetectPython.cmake
|
3 |
+
@@ -268,15 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION)
|
4 |
+
return()
|
5 |
+
endif()
|
6 |
+
|
7 |
+
-find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR
|
8 |
+
- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
|
9 |
+
- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
|
10 |
+
- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
|
11 |
+
- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
|
12 |
+
- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH
|
13 |
+
- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION)
|
14 |
+
-
|
15 |
+
-option(OPENCV_PYTHON3_VERSION "Python3 version" "")
|
16 |
+
find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
|
17 |
+
PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
|
18 |
+
PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/0012-fix-zlib.patch
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
2 |
+
index 6dbeca9..08e2f4a 100644
|
3 |
+
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
4 |
+
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
5 |
+
@@ -5,6 +5,9 @@
|
6 |
+
# --- zlib (required) ---
|
7 |
+
if(BUILD_ZLIB)
|
8 |
+
ocv_clear_vars(ZLIB_FOUND)
|
9 |
+
+elseif(1)
|
10 |
+
+ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
|
11 |
+
+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
|
12 |
+
else()
|
13 |
+
ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
|
14 |
+
if(ANDROID)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/portfile.cmake
ADDED
@@ -0,0 +1,535 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2")
|
2 |
+
message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2")
|
3 |
+
endif()
|
4 |
+
|
5 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4")
|
6 |
+
message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents)
|
10 |
+
string(JSON OPENCV_VERSION GET "${_contents}" version)
|
11 |
+
|
12 |
+
set(USE_QT_VERSION "5")
|
13 |
+
|
14 |
+
vcpkg_from_github(
|
15 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
16 |
+
REPO opencv/opencv
|
17 |
+
REF ${OPENCV_VERSION}
|
18 |
+
SHA512 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
|
19 |
+
HEAD_REF master
|
20 |
+
PATCHES
|
21 |
+
0001-disable-downloading.patch
|
22 |
+
0002-install-options.patch
|
23 |
+
0003-force-package-requirements.patch
|
24 |
+
0004-fix-eigen.patch
|
25 |
+
0005-fix-vtk9.patch
|
26 |
+
0006-fix-uwp.patch
|
27 |
+
0008-devendor-quirc.patch
|
28 |
+
0009-fix-protobuf.patch
|
29 |
+
0010-fix-uwp-tiff-imgcodecs.patch
|
30 |
+
0011-remove-python2.patch
|
31 |
+
0012-fix-zlib.patch
|
32 |
+
)
|
33 |
+
|
34 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
35 |
+
set(TARGET_IS_AARCH64 1)
|
36 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
37 |
+
set(TARGET_IS_ARM 1)
|
38 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
39 |
+
set(TARGET_IS_X86_64 1)
|
40 |
+
else()
|
41 |
+
set(TARGET_IS_X86 1)
|
42 |
+
endif()
|
43 |
+
|
44 |
+
file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
|
45 |
+
|
46 |
+
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
|
47 |
+
|
48 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
49 |
+
FEATURES
|
50 |
+
"contrib" WITH_CONTRIB
|
51 |
+
"cuda" WITH_CUBLAS
|
52 |
+
"cuda" WITH_CUDA
|
53 |
+
"dnn" BUILD_opencv_dnn
|
54 |
+
"eigen" WITH_EIGEN
|
55 |
+
"ffmpeg" WITH_FFMPEG
|
56 |
+
"flann" BUILD_opencv_flann
|
57 |
+
"gdcm" WITH_GDCM
|
58 |
+
"gstreamer" WITH_GSTREAMER
|
59 |
+
"halide" WITH_HALIDE
|
60 |
+
"jasper" WITH_JASPER
|
61 |
+
"jpeg" WITH_JPEG
|
62 |
+
"lapack" WITH_LAPACK
|
63 |
+
"nonfree" OPENCV_ENABLE_NONFREE
|
64 |
+
"openexr" WITH_OPENEXR
|
65 |
+
"opengl" WITH_OPENGL
|
66 |
+
"png" WITH_PNG
|
67 |
+
"quirc" WITH_QUIRC
|
68 |
+
"sfm" BUILD_opencv_sfm
|
69 |
+
"tiff" WITH_TIFF
|
70 |
+
"vtk" WITH_VTK
|
71 |
+
"webp" WITH_WEBP
|
72 |
+
"world" BUILD_opencv_world
|
73 |
+
)
|
74 |
+
|
75 |
+
# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb"
|
76 |
+
set(BUILD_opencv_dnn OFF)
|
77 |
+
if("dnn" IN_LIST FEATURES)
|
78 |
+
if(NOT VCPKG_TARGET_IS_ANDROID)
|
79 |
+
set(BUILD_opencv_dnn ON)
|
80 |
+
else()
|
81 |
+
message(WARNING "The dnn module cannot be enabled on Android")
|
82 |
+
endif()
|
83 |
+
endif()
|
84 |
+
|
85 |
+
set(WITH_GTK OFF)
|
86 |
+
if("gtk" IN_LIST FEATURES)
|
87 |
+
if(VCPKG_TARGET_IS_LINUX)
|
88 |
+
set(WITH_GTK ON)
|
89 |
+
else()
|
90 |
+
message(WARNING "The gtk module cannot be enabled outside Linux")
|
91 |
+
endif()
|
92 |
+
endif()
|
93 |
+
|
94 |
+
set(WITH_QT OFF)
|
95 |
+
if("qt" IN_LIST FEATURES)
|
96 |
+
set(WITH_QT ${USE_QT_VERSION})
|
97 |
+
endif()
|
98 |
+
|
99 |
+
set(WITH_IPP OFF)
|
100 |
+
if("ipp" IN_LIST FEATURES)
|
101 |
+
set(WITH_IPP ON)
|
102 |
+
endif()
|
103 |
+
|
104 |
+
set(BUILD_opencv_ovis OFF)
|
105 |
+
if("ovis" IN_LIST FEATURES)
|
106 |
+
set(BUILD_opencv_ovis ON)
|
107 |
+
endif()
|
108 |
+
|
109 |
+
set(WITH_TBB OFF)
|
110 |
+
if("tbb" IN_LIST FEATURES)
|
111 |
+
set(WITH_TBB ON)
|
112 |
+
endif()
|
113 |
+
|
114 |
+
set(WITH_PYTHON OFF)
|
115 |
+
if("python" IN_LIST FEATURES)
|
116 |
+
set(WITH_PYTHON ON)
|
117 |
+
vcpkg_find_acquire_program(PYTHON3)
|
118 |
+
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
|
119 |
+
vcpkg_add_to_path("${PYTHON3_DIR}")
|
120 |
+
vcpkg_add_to_path("${PYTHON3_DIR}/Scripts")
|
121 |
+
set(ENV{PYTHON} "${PYTHON3}")
|
122 |
+
|
123 |
+
function(vcpkg_get_python_package PYTHON_DIR )
|
124 |
+
cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES")
|
125 |
+
|
126 |
+
if(NOT _vgpp_PYTHON_EXECUTABLE)
|
127 |
+
message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!")
|
128 |
+
endif()
|
129 |
+
if(NOT _vgpp_PACKAGES)
|
130 |
+
message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!")
|
131 |
+
endif()
|
132 |
+
if(NOT _vgpp_PYTHON_DIR)
|
133 |
+
get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY)
|
134 |
+
endif()
|
135 |
+
|
136 |
+
if (WIN32)
|
137 |
+
set(PYTHON_OPTION "")
|
138 |
+
else()
|
139 |
+
set(PYTHON_OPTION "--user")
|
140 |
+
endif()
|
141 |
+
|
142 |
+
if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
143 |
+
if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
144 |
+
vcpkg_from_github(
|
145 |
+
OUT_SOURCE_PATH PYFILE_PATH
|
146 |
+
REPO pypa/get-pip
|
147 |
+
REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
|
148 |
+
SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
|
149 |
+
HEAD_REF master
|
150 |
+
)
|
151 |
+
execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION})
|
152 |
+
endif()
|
153 |
+
foreach(_package IN LISTS _vgpp_PACKAGES)
|
154 |
+
execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION})
|
155 |
+
endforeach()
|
156 |
+
else()
|
157 |
+
foreach(_package IN LISTS _vgpp_PACKAGES)
|
158 |
+
execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package})
|
159 |
+
endforeach()
|
160 |
+
endif()
|
161 |
+
endfunction()
|
162 |
+
vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy)
|
163 |
+
endif()
|
164 |
+
|
165 |
+
if("dnn" IN_LIST FEATURES)
|
166 |
+
vcpkg_download_distfile(TINYDNN_ARCHIVE
|
167 |
+
URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz"
|
168 |
+
FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz"
|
169 |
+
SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
|
170 |
+
)
|
171 |
+
endif()
|
172 |
+
|
173 |
+
# Build image quality module when building with 'contrib' feature and not UWP.
|
174 |
+
set(BUILD_opencv_quality OFF)
|
175 |
+
if("contrib" IN_LIST FEATURES)
|
176 |
+
if (VCPKG_TARGET_IS_UWP)
|
177 |
+
set(BUILD_opencv_quality OFF)
|
178 |
+
message(WARNING "The image quality module (quality) does not build for UWP, the module has been disabled.")
|
179 |
+
# The hdf module is silently disabled by OpenCVs buildsystem if HDF5 is not detected.
|
180 |
+
message(WARNING "The hierarchical data format module (hdf) depends on HDF5 which doesn't support UWP, the module has been disabled.")
|
181 |
+
else()
|
182 |
+
set(BUILD_opencv_quality CMAKE_DEPENDS_IN_PROJECT_ONLY)
|
183 |
+
endif()
|
184 |
+
|
185 |
+
vcpkg_from_github(
|
186 |
+
OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
|
187 |
+
REPO opencv/opencv_contrib
|
188 |
+
REF ${OPENCV_VERSION}
|
189 |
+
SHA512 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35
|
190 |
+
HEAD_REF master
|
191 |
+
PATCHES
|
192 |
+
0007-fix-hdf5.patch
|
193 |
+
)
|
194 |
+
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
|
195 |
+
|
196 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
197 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat"
|
198 |
+
FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat"
|
199 |
+
SHA512 c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
|
200 |
+
)
|
201 |
+
|
202 |
+
function(download_opencv_3rdparty ID COMMIT HASH)
|
203 |
+
if(NOT EXISTS "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp")
|
204 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
205 |
+
URLS "https://github.com/opencv/opencv_3rdparty/archive/${COMMIT}.zip"
|
206 |
+
FILENAME "opencv_3rdparty-${COMMIT}.zip"
|
207 |
+
SHA512 ${HASH}
|
208 |
+
)
|
209 |
+
vcpkg_extract_source_archive(extracted_ocv ARCHIVE "${OCV_DOWNLOAD}")
|
210 |
+
file(MAKE_DIRECTORY "${DOWNLOADS}/opencv-cache/${ID}")
|
211 |
+
file(GLOB XFEATURES2D_I "${extracted_ocv}/*")
|
212 |
+
foreach(FILE ${XFEATURES2D_I})
|
213 |
+
file(COPY ${FILE} DESTINATION "${DOWNLOADS}/opencv-cache/${ID}")
|
214 |
+
get_filename_component(XFEATURES2D_I_NAME "${FILE}" NAME)
|
215 |
+
file(MD5 "${FILE}" FILE_HASH)
|
216 |
+
file(RENAME "${DOWNLOADS}/opencv-cache/${ID}/${XFEATURES2D_I_NAME}" "${DOWNLOADS}/opencv-cache/${ID}/${FILE_HASH}-${XFEATURES2D_I_NAME}")
|
217 |
+
endforeach()
|
218 |
+
file(WRITE "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp")
|
219 |
+
endif()
|
220 |
+
endfunction()
|
221 |
+
|
222 |
+
# Used for opencv's xfeature2d module
|
223 |
+
download_opencv_3rdparty(
|
224 |
+
xfeatures2d/boostdesc
|
225 |
+
34e4206aef44d50e6bbcd0ab06354b52e7466d26
|
226 |
+
2ccdc8fb59da55eabc73309a80a4d3b1e73e2341027cdcdd2d714e0f519e60f243f38f79b13ed3de32f595aa23e4f86418eed42e741f32a81b1e6e0879190601
|
227 |
+
)
|
228 |
+
|
229 |
+
# Used for opencv's xfeature2d module
|
230 |
+
download_opencv_3rdparty(
|
231 |
+
xfeatures2d/vgg
|
232 |
+
fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d
|
233 |
+
7051f5d6ccb938d296b919dd6d5dcddc5afb527aed456639c9984276a8f64565c084d96a72499a7756f127f8d2b1ce9ab70e4cbb3f89c4e16f82296c2a15daed
|
234 |
+
)
|
235 |
+
endif()
|
236 |
+
|
237 |
+
if(WITH_IPP)
|
238 |
+
if(VCPKG_TARGET_IS_OSX)
|
239 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
240 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
241 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_mac_intel64_20191018_general.tgz"
|
242 |
+
FILENAME "opencv-cache/ippicv/1c3d675c2a2395d094d523024896e01b-ippicv_2020_mac_intel64_20191018_general.tgz"
|
243 |
+
SHA512 454dfaaa245e3a3b2f1ffb1aa8e27e280b03685009d66e147482b14e5796fdf2d332cac0f9b0822caedd5760fda4ee0ce2961889597456bbc18202f10bf727cd
|
244 |
+
)
|
245 |
+
else()
|
246 |
+
message(WARNING "This target architecture is not supported IPPICV")
|
247 |
+
set(WITH_IPP OFF)
|
248 |
+
endif()
|
249 |
+
elseif(VCPKG_TARGET_IS_LINUX)
|
250 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
251 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
252 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz"
|
253 |
+
FILENAME "opencv-cache/ippicv/7421de0095c7a39162ae13a6098782f9-ippicv_2020_lnx_intel64_20191018_general.tgz"
|
254 |
+
SHA512 de6d80695cd6deef359376476edc4ff85fdddcf94972b936e0017f8a48aaa5d18f55c4253ae37deb83bff2f71410f68408063c88b5f3bf4df3c416aa93ceca87
|
255 |
+
)
|
256 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
257 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
258 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz"
|
259 |
+
FILENAME "opencv-cache/ippicv/ad189a940fb60eb71f291321322fe3e8-ippicv_2020_lnx_ia32_20191018_general.tgz"
|
260 |
+
SHA512 5ca9dafc3a634e2a5f83f6a498611c990ef16d54358e9b44574b01694e9d64b118d46d6e2011506e40d37e5a9865f576f790e37ff96b7c8b503507633631a296
|
261 |
+
)
|
262 |
+
else()
|
263 |
+
message(WARNING "This target architecture is not supported IPPICV")
|
264 |
+
set(WITH_IPP OFF)
|
265 |
+
endif()
|
266 |
+
elseif(VCPKG_TARGET_IS_WINDOWS)
|
267 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
268 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
269 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_intel64_20191018_general.zip"
|
270 |
+
FILENAME "opencv-cache/ippicv/879741a7946b814455eee6c6ffde2984-ippicv_2020_win_intel64_20191018_general.zip"
|
271 |
+
SHA512 50c4af4b7fe2161d652264230389dad2330e8c95b734d04fb7565bffdab855c06d43085e480da554c56b04f8538087d49503538d5943221ee2a772ee7be4c93c
|
272 |
+
)
|
273 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
274 |
+
vcpkg_download_distfile(OCV_DOWNLOAD
|
275 |
+
URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/a56b6ac6f030c312b2dce17430eef13aed9af274/ippicv/ippicv_2020_win_ia32_20191018_general.zip"
|
276 |
+
FILENAME "opencv-cache/ippicv/cd39bdf0c2e1cac9a61101dad7a2413e-ippicv_2020_win_ia32_20191018_general.zip"
|
277 |
+
SHA512 058d00775d9f16955c7a557d554b8c2976ab9dbad4ba3fdb9823c0f768809edbd835e4397f01dc090a9bc80d81de834375e7006614d2a898f42e8004de0e04bf
|
278 |
+
)
|
279 |
+
else()
|
280 |
+
message(WARNING "This target architecture is not supported IPPICV")
|
281 |
+
set(WITH_IPP OFF)
|
282 |
+
endif()
|
283 |
+
else()
|
284 |
+
message(WARNING "This target architecture is not supported IPPICV")
|
285 |
+
set(WITH_IPP OFF)
|
286 |
+
endif()
|
287 |
+
endif()
|
288 |
+
|
289 |
+
set(WITH_MSMF ON)
|
290 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
|
291 |
+
set(WITH_MSMF OFF)
|
292 |
+
endif()
|
293 |
+
|
294 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
295 |
+
if (WITH_TBB)
|
296 |
+
message(WARNING "TBB is currently unsupported in this build configuration, turning it off")
|
297 |
+
set(WITH_TBB OFF)
|
298 |
+
endif()
|
299 |
+
|
300 |
+
if (VCPKG_TARGET_IS_WINDOWS AND BUILD_opencv_ovis)
|
301 |
+
message(WARNING "OVIS is currently unsupported in this build configuration, turning it off")
|
302 |
+
set(BUILD_opencv_ovis OFF)
|
303 |
+
endif()
|
304 |
+
endif()
|
305 |
+
|
306 |
+
if("ffmpeg" IN_LIST FEATURES)
|
307 |
+
if(VCPKG_TARGET_IS_UWP)
|
308 |
+
set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}")
|
309 |
+
set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}")
|
310 |
+
endif()
|
311 |
+
endif()
|
312 |
+
|
313 |
+
if("qt" IN_LIST FEATURES)
|
314 |
+
list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON")
|
315 |
+
endif()
|
316 |
+
|
317 |
+
set(BUILD_opencv_line_descriptor ON)
|
318 |
+
set(BUILD_opencv_saliency ON)
|
319 |
+
set(BUILD_opencv_bgsegm ON)
|
320 |
+
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
|
321 |
+
set(BUILD_opencv_line_descriptor OFF)
|
322 |
+
set(BUILD_opencv_saliency OFF)
|
323 |
+
set(BUILD_opencv_bgsegm OFF)
|
324 |
+
endif()
|
325 |
+
|
326 |
+
vcpkg_cmake_configure(
|
327 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
328 |
+
OPTIONS
|
329 |
+
###### opencv cpu recognition is broken, always using host and not target: here we bypass that
|
330 |
+
-DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE
|
331 |
+
-DAARCH64=${TARGET_IS_AARCH64}
|
332 |
+
-DX86_64=${TARGET_IS_X86_64}
|
333 |
+
-DX86=${TARGET_IS_X86}
|
334 |
+
-DARM=${TARGET_IS_ARM}
|
335 |
+
###### ocv_options
|
336 |
+
-DOpenCV_INSTALL_BINARIES_PREFIX=
|
337 |
+
-DOPENCV_BIN_INSTALL_PATH=bin
|
338 |
+
-DOPENCV_INCLUDE_INSTALL_PATH=include
|
339 |
+
-DOPENCV_LIB_INSTALL_PATH=lib
|
340 |
+
-DOPENCV_3P_LIB_INSTALL_PATH=lib
|
341 |
+
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv
|
342 |
+
-DINSTALL_TO_MANGLED_PATHS=OFF
|
343 |
+
-DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG
|
344 |
+
-DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE
|
345 |
+
-DCMAKE_DEBUG_POSTFIX=d
|
346 |
+
-DOPENCV_DLLVERSION=
|
347 |
+
-DOPENCV_DEBUG_POSTFIX=d
|
348 |
+
-DOPENCV_GENERATE_SETUPVARS=OFF
|
349 |
+
# Do not build docs/examples
|
350 |
+
-DBUILD_DOCS=OFF
|
351 |
+
-DBUILD_EXAMPLES=OFF
|
352 |
+
###### Disable build 3rd party libs
|
353 |
+
-DBUILD_JASPER=OFF
|
354 |
+
-DBUILD_JPEG=OFF
|
355 |
+
-DBUILD_OPENEXR=OFF
|
356 |
+
-DBUILD_PNG=OFF
|
357 |
+
-DBUILD_TIFF=OFF
|
358 |
+
-DBUILD_WEBP=OFF
|
359 |
+
-DBUILD_ZLIB=OFF
|
360 |
+
-DBUILD_TBB=OFF
|
361 |
+
-DBUILD_IPP_IW=OFF
|
362 |
+
-DBUILD_ITT=OFF
|
363 |
+
###### Disable build 3rd party components
|
364 |
+
-DBUILD_PROTOBUF=OFF
|
365 |
+
###### OpenCV Build components
|
366 |
+
-DBUILD_opencv_apps=OFF
|
367 |
+
-DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm}
|
368 |
+
-DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor}
|
369 |
+
-DBUILD_opencv_saliency=${BUILD_opencv_saliency}
|
370 |
+
-DBUILD_ANDROID_PROJECT=OFF
|
371 |
+
-DBUILD_ANDROID_EXAMPLES=OFF
|
372 |
+
-DBUILD_PACKAGE=OFF
|
373 |
+
-DBUILD_PERF_TESTS=OFF
|
374 |
+
-DBUILD_TESTS=OFF
|
375 |
+
-DBUILD_WITH_DEBUG_INFO=ON
|
376 |
+
-DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT}
|
377 |
+
-DBUILD_JAVA=OFF
|
378 |
+
-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
|
379 |
+
###### PROTOBUF
|
380 |
+
-DPROTOBUF_UPDATE_FILES=${BUILD_opencv_flann}
|
381 |
+
-DUPDATE_PROTO_FILES=${BUILD_opencv_flann}
|
382 |
+
###### PYLINT/FLAKE8
|
383 |
+
-DENABLE_PYLINT=OFF
|
384 |
+
-DENABLE_FLAKE8=OFF
|
385 |
+
# CMAKE
|
386 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
|
387 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
|
388 |
+
# ENABLE
|
389 |
+
-DENABLE_CXX11=ON
|
390 |
+
###### OPENCV vars
|
391 |
+
"-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache"
|
392 |
+
${BUILD_WITH_CONTRIB_FLAG}
|
393 |
+
-DOPENCV_OTHER_INSTALL_PATH=share/opencv
|
394 |
+
###### customized properties
|
395 |
+
## Options from vcpkg_check_features()
|
396 |
+
${FEATURE_OPTIONS}
|
397 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON
|
398 |
+
-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}
|
399 |
+
-DWITH_GTK=${WITH_GTK}
|
400 |
+
-DWITH_QT=${WITH_QT}
|
401 |
+
-DWITH_IPP=${WITH_IPP}
|
402 |
+
-DWITH_MATLAB=OFF
|
403 |
+
-DWITH_MSMF=${WITH_MSMF}
|
404 |
+
-DWITH_OPENMP=OFF
|
405 |
+
-DWITH_PROTOBUF=${BUILD_opencv_flann}
|
406 |
+
-DWITH_PYTHON=${WITH_PYTHON}
|
407 |
+
-DWITH_OPENCLAMDBLAS=OFF
|
408 |
+
-DWITH_TBB=${WITH_TBB}
|
409 |
+
-DWITH_OPENJPEG=OFF
|
410 |
+
-DWITH_CPUFEATURES=OFF
|
411 |
+
###### BUILD_options (mainly modules which require additional libraries)
|
412 |
+
-DBUILD_opencv_ovis=${BUILD_opencv_ovis}
|
413 |
+
-DBUILD_opencv_dnn=${BUILD_opencv_dnn}
|
414 |
+
###### The following modules are disabled for UWP
|
415 |
+
-DBUILD_opencv_quality=${BUILD_opencv_quality}
|
416 |
+
###### Additional build flags
|
417 |
+
${ADDITIONAL_BUILD_FLAGS}
|
418 |
+
)
|
419 |
+
|
420 |
+
vcpkg_cmake_install()
|
421 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv")
|
422 |
+
vcpkg_copy_pdbs()
|
423 |
+
|
424 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
425 |
+
file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES)
|
426 |
+
set(DEPS_STRING "include(CMakeFindDependencyMacro)
|
427 |
+
if(${BUILD_opencv_flann})
|
428 |
+
find_dependency(Protobuf CONFIG REQUIRED)
|
429 |
+
if(TARGET protobuf::libprotobuf)
|
430 |
+
add_library (libprotobuf INTERFACE IMPORTED)
|
431 |
+
set_target_properties(libprotobuf PROPERTIES
|
432 |
+
INTERFACE_LINK_LIBRARIES protobuf::libprotobuf
|
433 |
+
)
|
434 |
+
else()
|
435 |
+
add_library (libprotobuf UNKNOWN IMPORTED)
|
436 |
+
set_target_properties(libprotobuf PROPERTIES
|
437 |
+
IMPORTED_LOCATION \"${Protobuf_LIBRARY}\"
|
438 |
+
INTERFACE_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\"
|
439 |
+
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES \"${Protobuf_INCLUDE_DIR}\"
|
440 |
+
)
|
441 |
+
endif()
|
442 |
+
endif()
|
443 |
+
find_dependency(Threads)")
|
444 |
+
if("tiff" IN_LIST FEATURES)
|
445 |
+
string(APPEND DEPS_STRING "\nfind_dependency(TIFF)")
|
446 |
+
endif()
|
447 |
+
if("cuda" IN_LIST FEATURES)
|
448 |
+
string(APPEND DEPS_STRING "\nfind_dependency(CUDA)")
|
449 |
+
endif()
|
450 |
+
if(BUILD_opencv_quality)
|
451 |
+
string(APPEND DEPS_STRING "
|
452 |
+
# C language is required for try_compile tests in FindHDF5
|
453 |
+
enable_language(C)
|
454 |
+
find_dependency(HDF5)
|
455 |
+
find_dependency(Tesseract)")
|
456 |
+
endif()
|
457 |
+
if(WITH_TBB)
|
458 |
+
string(APPEND DEPS_STRING "\nfind_dependency(TBB)")
|
459 |
+
endif()
|
460 |
+
if("vtk" IN_LIST FEATURES)
|
461 |
+
string(APPEND DEPS_STRING "\nfind_dependency(VTK)")
|
462 |
+
endif()
|
463 |
+
if("sfm" IN_LIST FEATURES)
|
464 |
+
string(APPEND DEPS_STRING "\nfind_dependency(gflags CONFIG)\nfind_dependency(Ceres CONFIG)")
|
465 |
+
endif()
|
466 |
+
if("eigen" IN_LIST FEATURES)
|
467 |
+
string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)")
|
468 |
+
endif()
|
469 |
+
if("lapack" IN_LIST FEATURES)
|
470 |
+
string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)")
|
471 |
+
endif()
|
472 |
+
if("openexr" IN_LIST FEATURES)
|
473 |
+
string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
|
474 |
+
endif()
|
475 |
+
if(WITH_OPENMP)
|
476 |
+
string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)")
|
477 |
+
endif()
|
478 |
+
if(BUILD_opencv_ovis)
|
479 |
+
string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)")
|
480 |
+
endif()
|
481 |
+
if("quirc" IN_LIST FEATURES)
|
482 |
+
string(APPEND DEPS_STRING "\nfind_dependency(quirc)")
|
483 |
+
endif()
|
484 |
+
if("qt" IN_LIST FEATURES)
|
485 |
+
string(APPEND DEPS_STRING "
|
486 |
+
set(CMAKE_AUTOMOC ON)
|
487 |
+
set(CMAKE_AUTORCC ON)
|
488 |
+
set(CMAKE_AUTOUIC ON)
|
489 |
+
find_dependency(Qt${USE_QT_VERSION} COMPONENTS Core Gui Widgets Test Concurrent)")
|
490 |
+
if("opengl" IN_LIST FEATURES)
|
491 |
+
string(APPEND DEPS_STRING "
|
492 |
+
find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)")
|
493 |
+
endif()
|
494 |
+
endif()
|
495 |
+
if("ade" IN_LIST FEATURES)
|
496 |
+
string(APPEND DEPS_STRING "\nfind_dependency(ade)")
|
497 |
+
endif()
|
498 |
+
if("gdcm" IN_LIST FEATURES)
|
499 |
+
string(APPEND DEPS_STRING "\nfind_dependency(GDCM)")
|
500 |
+
endif()
|
501 |
+
|
502 |
+
string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)"
|
503 |
+
"set(CMAKE_IMPORT_FILE_VERSION 1)\n${DEPS_STRING}" OPENCV_MODULES "${OPENCV_MODULES}")
|
504 |
+
|
505 |
+
if(WITH_OPENMP)
|
506 |
+
string(REPLACE "set_target_properties(opencv_core PROPERTIES
|
507 |
+
INTERFACE_LINK_LIBRARIES \""
|
508 |
+
"set_target_properties(opencv_core PROPERTIES
|
509 |
+
INTERFACE_LINK_LIBRARIES \"\$<LINK_ONLY:OpenMP::OpenMP_CXX>;" OPENCV_MODULES "${OPENCV_MODULES}")
|
510 |
+
endif()
|
511 |
+
|
512 |
+
if(BUILD_opencv_ovis)
|
513 |
+
string(REPLACE "OgreGLSupportStatic"
|
514 |
+
"OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}")
|
515 |
+
endif()
|
516 |
+
|
517 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}")
|
518 |
+
|
519 |
+
|
520 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
521 |
+
endif()
|
522 |
+
|
523 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
524 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
525 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE")
|
526 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE")
|
527 |
+
|
528 |
+
if(VCPKG_TARGET_IS_ANDROID)
|
529 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android")
|
530 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android")
|
531 |
+
endif()
|
532 |
+
|
533 |
+
vcpkg_fixup_pkgconfig()
|
534 |
+
|
535 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv3/vcpkg.json
ADDED
@@ -0,0 +1,268 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "opencv3",
|
3 |
+
"version": "3.4.16",
|
4 |
+
"port-version": 5,
|
5 |
+
"description": "computer vision library",
|
6 |
+
"homepage": "https://github.com/opencv/opencv",
|
7 |
+
"license": "BSD-3-Clause",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
},
|
17 |
+
"zlib"
|
18 |
+
],
|
19 |
+
"default-features": [
|
20 |
+
"default-features"
|
21 |
+
],
|
22 |
+
"features": {
|
23 |
+
"contrib": {
|
24 |
+
"description": "opencv_contrib module",
|
25 |
+
"dependencies": [
|
26 |
+
{
|
27 |
+
"name": "hdf5",
|
28 |
+
"platform": "!uwp & !(windows & (arm | arm64))"
|
29 |
+
},
|
30 |
+
{
|
31 |
+
"name": "opencv3",
|
32 |
+
"features": [
|
33 |
+
"dnn"
|
34 |
+
]
|
35 |
+
},
|
36 |
+
{
|
37 |
+
"name": "tesseract",
|
38 |
+
"platform": "!uwp & !(windows & (arm | arm64))"
|
39 |
+
}
|
40 |
+
]
|
41 |
+
},
|
42 |
+
"cuda": {
|
43 |
+
"description": "CUDA support for opencv",
|
44 |
+
"dependencies": [
|
45 |
+
"cuda",
|
46 |
+
"cudnn",
|
47 |
+
{
|
48 |
+
"name": "opencv3",
|
49 |
+
"features": [
|
50 |
+
"contrib"
|
51 |
+
]
|
52 |
+
}
|
53 |
+
]
|
54 |
+
},
|
55 |
+
"default-features": {
|
56 |
+
"description": "Platform-dependent default features",
|
57 |
+
"dependencies": [
|
58 |
+
{
|
59 |
+
"name": "opencv3",
|
60 |
+
"default-features": false,
|
61 |
+
"features": [
|
62 |
+
"dnn",
|
63 |
+
"jpeg",
|
64 |
+
"png",
|
65 |
+
"quirc",
|
66 |
+
"tiff",
|
67 |
+
"webp"
|
68 |
+
]
|
69 |
+
},
|
70 |
+
{
|
71 |
+
"name": "opencv3",
|
72 |
+
"default-features": false,
|
73 |
+
"features": [
|
74 |
+
"gtk"
|
75 |
+
],
|
76 |
+
"platform": "linux"
|
77 |
+
}
|
78 |
+
]
|
79 |
+
},
|
80 |
+
"dnn": {
|
81 |
+
"description": "Enable dnn module",
|
82 |
+
"dependencies": [
|
83 |
+
{
|
84 |
+
"name": "opencv3",
|
85 |
+
"features": [
|
86 |
+
"flann"
|
87 |
+
]
|
88 |
+
}
|
89 |
+
]
|
90 |
+
},
|
91 |
+
"eigen": {
|
92 |
+
"description": "Eigen support for opencv",
|
93 |
+
"dependencies": [
|
94 |
+
"eigen3"
|
95 |
+
]
|
96 |
+
},
|
97 |
+
"ffmpeg": {
|
98 |
+
"description": "ffmpeg support for opencv",
|
99 |
+
"dependencies": [
|
100 |
+
{
|
101 |
+
"name": "ffmpeg",
|
102 |
+
"default-features": false,
|
103 |
+
"features": [
|
104 |
+
"avcodec",
|
105 |
+
"avformat",
|
106 |
+
"swresample",
|
107 |
+
"swscale"
|
108 |
+
]
|
109 |
+
}
|
110 |
+
]
|
111 |
+
},
|
112 |
+
"flann": {
|
113 |
+
"description": "opencv_flann module",
|
114 |
+
"dependencies": [
|
115 |
+
"protobuf"
|
116 |
+
]
|
117 |
+
},
|
118 |
+
"gdcm": {
|
119 |
+
"description": "GDCM support for opencv",
|
120 |
+
"dependencies": [
|
121 |
+
"gdcm"
|
122 |
+
]
|
123 |
+
},
|
124 |
+
"gstreamer": {
|
125 |
+
"description": "gstreamer support for opencv",
|
126 |
+
"dependencies": [
|
127 |
+
"gstreamer"
|
128 |
+
]
|
129 |
+
},
|
130 |
+
"gtk": {
|
131 |
+
"description": "GTK support for opencv",
|
132 |
+
"dependencies": [
|
133 |
+
"gtk"
|
134 |
+
]
|
135 |
+
},
|
136 |
+
"halide": {
|
137 |
+
"description": "Halide support for opencv",
|
138 |
+
"dependencies": [
|
139 |
+
"halide",
|
140 |
+
{
|
141 |
+
"name": "opencv3",
|
142 |
+
"default-features": false
|
143 |
+
},
|
144 |
+
{
|
145 |
+
"name": "opencv3",
|
146 |
+
"features": [
|
147 |
+
"dnn"
|
148 |
+
]
|
149 |
+
}
|
150 |
+
]
|
151 |
+
},
|
152 |
+
"ipp": {
|
153 |
+
"description": "Enable Intel Integrated Performance Primitives"
|
154 |
+
},
|
155 |
+
"jasper": {
|
156 |
+
"description": "JPEG 2000 support for opencv",
|
157 |
+
"dependencies": [
|
158 |
+
"jasper"
|
159 |
+
]
|
160 |
+
},
|
161 |
+
"jpeg": {
|
162 |
+
"description": "JPEG support for opencv",
|
163 |
+
"dependencies": [
|
164 |
+
"libjpeg-turbo"
|
165 |
+
]
|
166 |
+
},
|
167 |
+
"lapack": {
|
168 |
+
"description": "LAPACK support for opencv",
|
169 |
+
"dependencies": [
|
170 |
+
"blas",
|
171 |
+
"lapack"
|
172 |
+
]
|
173 |
+
},
|
174 |
+
"nonfree": {
|
175 |
+
"description": "allow nonfree and unredistributable libraries"
|
176 |
+
},
|
177 |
+
"openexr": {
|
178 |
+
"description": "OpenEXR support for opencv",
|
179 |
+
"dependencies": [
|
180 |
+
"openexr"
|
181 |
+
]
|
182 |
+
},
|
183 |
+
"opengl": {
|
184 |
+
"description": "opengl support for opencv",
|
185 |
+
"dependencies": [
|
186 |
+
"opengl"
|
187 |
+
]
|
188 |
+
},
|
189 |
+
"ovis": {
|
190 |
+
"description": "opencv_ovis module",
|
191 |
+
"dependencies": [
|
192 |
+
"ogre",
|
193 |
+
{
|
194 |
+
"name": "opencv3",
|
195 |
+
"features": [
|
196 |
+
"contrib"
|
197 |
+
]
|
198 |
+
}
|
199 |
+
]
|
200 |
+
},
|
201 |
+
"png": {
|
202 |
+
"description": "PNG support for opencv",
|
203 |
+
"dependencies": [
|
204 |
+
"libpng"
|
205 |
+
]
|
206 |
+
},
|
207 |
+
"python": {
|
208 |
+
"description": "Python wrapper support for opencv"
|
209 |
+
},
|
210 |
+
"qt": {
|
211 |
+
"description": "Qt GUI support for opencv",
|
212 |
+
"dependencies": [
|
213 |
+
{
|
214 |
+
"name": "qt5-base",
|
215 |
+
"default-features": false
|
216 |
+
}
|
217 |
+
]
|
218 |
+
},
|
219 |
+
"quirc": {
|
220 |
+
"description": "Enable QR code module",
|
221 |
+
"dependencies": [
|
222 |
+
"quirc"
|
223 |
+
]
|
224 |
+
},
|
225 |
+
"sfm": {
|
226 |
+
"description": "opencv_sfm module",
|
227 |
+
"dependencies": [
|
228 |
+
"ceres",
|
229 |
+
"eigen3",
|
230 |
+
"gflags",
|
231 |
+
"glog",
|
232 |
+
{
|
233 |
+
"name": "opencv3",
|
234 |
+
"features": [
|
235 |
+
"contrib"
|
236 |
+
]
|
237 |
+
}
|
238 |
+
]
|
239 |
+
},
|
240 |
+
"tbb": {
|
241 |
+
"description": "Enable Intel Threading Building Blocks",
|
242 |
+
"dependencies": [
|
243 |
+
"tbb"
|
244 |
+
]
|
245 |
+
},
|
246 |
+
"tiff": {
|
247 |
+
"description": "TIFF support for opencv",
|
248 |
+
"dependencies": [
|
249 |
+
"tiff"
|
250 |
+
]
|
251 |
+
},
|
252 |
+
"vtk": {
|
253 |
+
"description": "vtk support for opencv",
|
254 |
+
"dependencies": [
|
255 |
+
"vtk"
|
256 |
+
]
|
257 |
+
},
|
258 |
+
"webp": {
|
259 |
+
"description": "WebP support for opencv",
|
260 |
+
"dependencies": [
|
261 |
+
"libwebp"
|
262 |
+
]
|
263 |
+
},
|
264 |
+
"world": {
|
265 |
+
"description": "Compile to a single package support for opencv"
|
266 |
+
}
|
267 |
+
}
|
268 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv4/0001-disable-downloading.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/cmake/OpenCVDownload.cmake
|
2 |
+
+++ b/cmake/OpenCVDownload.cmake
|
3 |
+
@@ -157,6 +157,9 @@ function(ocv_download)
|
4 |
+
# Download
|
5 |
+
if(NOT EXISTS "${CACHE_CANDIDATE}")
|
6 |
+
ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
|
7 |
+
+ string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
|
8 |
+
+ message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${DL_URL}\"\n FILENAME \"${CACHE_SUBPATH}\"\n SHA512 0\n )")
|
9 |
+
+
|
10 |
+
foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
|
11 |
+
ocv_download_log("#try ${try}")
|
12 |
+
file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opencv4/0002-install-options.patch
ADDED
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeLists.txt
|
2 |
+
+++ b/CMakeLists.txt
|
3 |
+
@@ -616,7 +616,7 @@ endif()
|
4 |
+
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
|
5 |
+
|
6 |
+
# --- Python Support ---
|
7 |
+
-if(NOT IOS)
|
8 |
+
+if(WITH_PYTHON)
|
9 |
+
include(cmake/OpenCVDetectPython.cmake)
|
10 |
+
endif()
|
11 |
+
|
12 |
+
--- a/cmake/OpenCVCompilerOptions.cmake
|
13 |
+
+++ b/cmake/OpenCVCompilerOptions.cmake
|
14 |
+
@@ -286,7 +286,6 @@ if(MSVC)
|
15 |
+
#endif()
|
16 |
+
|
17 |
+
if(BUILD_WITH_DEBUG_INFO)
|
18 |
+
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
|
19 |
+
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
|
20 |
+
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
|
21 |
+
set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug")
|
22 |
+
--- a/cmake/OpenCVGenConfig.cmake
|
23 |
+
+++ b/cmake/OpenCVGenConfig.cmake
|
24 |
+
@@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
|
25 |
+
endif()
|
26 |
+
endfunction()
|
27 |
+
|
28 |
+
-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
|
29 |
+
+if(TRUE)
|
30 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
|
31 |
+
endif()
|
32 |
+
|
33 |
+
-if(ANDROID)
|
34 |
+
+if(FALSE)
|
35 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in")
|
36 |
+
install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev)
|
37 |
+
endif()
|
38 |
+
@@ -126,7 +126,7 @@ endif()
|
39 |
+
# --------------------------------------------------------------------------------------------
|
40 |
+
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
|
41 |
+
# --------------------------------------------------------------------------------------------
|
42 |
+
-if(WIN32)
|
43 |
+
+if(0)
|
44 |
+
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
|
45 |
+
ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
|
46 |
+
"${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
|
47 |
+
--- a/data/CMakeLists.txt
|
48 |
+
+++ b/data/CMakeLists.txt
|
49 |
+
@@ -1,8 +1,6 @@
|
50 |
+
file(GLOB HAAR_CASCADES haarcascades/*.xml)
|
51 |
+
file(GLOB LBP_CASCADES lbpcascades/*.xml)
|
52 |
+
|
53 |
+
-install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
|
54 |
+
-install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs)
|
55 |
+
|
56 |
+
if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
|
57 |
+
install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")
|