Spaces:
Sleeping
Sleeping
e08f8b4123f453b57bb0e8a7e29a86973f5a30a916e1528336bdff48b3b87dc7
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmama/vcpkg.json +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/portfile.cmake +63 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/usage +5 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/vcpkg.json +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/keep_isystem.patch +283 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/portfile.cmake +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/0001-eigen_3.4.0.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/0002-eigen-3.4.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/build_fixes.patch +763 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/portfile.cmake +173 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/vcpkg.json +59 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch +19 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/fix-build.patch +449 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/portfile.cmake +72 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/vcpkg.json +48 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/inherit_from_parent_or_project_defaults.patch +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/openni2deploy.ps1 +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/portfile.cmake +213 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/replace_environment_variable.patch +76 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/upgrade_projects.patch +1572 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/vcpkg.json +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/fix-build.patch +121 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/portfile.cmake +45 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/vcpkg.json +39 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-unix/portfile.cmake +1 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-unix/vcpkg.json +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-uwp/portfile.cmake +1 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-uwp/vcpkg.json +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-windows/portfile.cmake +1 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-windows/vcpkg.json +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/install-pc-files.cmake +32 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/openssl.pc.in +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/portfile.cmake +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/CMakeLists.txt +285 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/portfile.cmake +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/remove-deps.cmake +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/uwp/make-openssl.bat +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/uwp/portfile.cmake +160 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in +82 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/vcpkg.json +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/windows/portfile.cmake +185 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-build-type.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-dependencies.patch +146 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-mac-build.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-version-search.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix_compile-option.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/portfile.cmake +135 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmama/vcpkg.json
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openmama",
|
3 |
+
"version-semver": "6.3.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages",
|
6 |
+
"homepage": "https://github.com/finos/OpenMAMA",
|
7 |
+
"supports": "windows & (x64 | x86)",
|
8 |
+
"dependencies": [
|
9 |
+
"apr",
|
10 |
+
"libevent",
|
11 |
+
"qpid-proton"
|
12 |
+
]
|
13 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/portfile.cmake
ADDED
@@ -0,0 +1,63 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(VERSION 8.1)
|
2 |
+
|
3 |
+
# Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
|
4 |
+
vcpkg_download_distfile(ARCHIVE
|
5 |
+
URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz"
|
6 |
+
FILENAME "OpenMesh-${VERSION}.tar.gz"
|
7 |
+
SHA512 c146e6b21d709a31772621a6a913def93a51460c4abb950c2eb64eea4528c7efd4c86166ba56ae0bc8090cc5878dd9328b570e094e61c1b64d6d298de05aca61
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_extract_source_archive_ex(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
ARCHIVE "${ARCHIVE}"
|
13 |
+
REF "${VERSION}"
|
14 |
+
)
|
15 |
+
|
16 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
17 |
+
set(OPENMESH_BUILD_SHARED ON)
|
18 |
+
else()
|
19 |
+
set(OPENMESH_BUILD_SHARED OFF)
|
20 |
+
endif()
|
21 |
+
|
22 |
+
vcpkg_configure_cmake(
|
23 |
+
SOURCE_PATH ${SOURCE_PATH}
|
24 |
+
PREFER_NINJA
|
25 |
+
OPTIONS
|
26 |
+
-DBUILD_APPS=OFF
|
27 |
+
-DOPENMESH_BUILD_SHARED=${OPENMESH_BUILD_SHARED}
|
28 |
+
# [TODO]: add apps as feature, requires qt5 and freeglut
|
29 |
+
)
|
30 |
+
|
31 |
+
vcpkg_install_cmake()
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake)
|
34 |
+
|
35 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
36 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
|
37 |
+
endif()
|
38 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
39 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
|
40 |
+
endif()
|
41 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata")
|
42 |
+
vcpkg_fixup_pkgconfig()
|
43 |
+
|
44 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
45 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm)
|
46 |
+
# Only move dynamic libraries to bin on Windows
|
47 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
48 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
49 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
|
50 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll)
|
51 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll)
|
52 |
+
endif()
|
53 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
54 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
|
55 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll)
|
56 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll)
|
57 |
+
endif()
|
58 |
+
endif()
|
59 |
+
|
60 |
+
configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
|
61 |
+
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
62 |
+
# Handle copyright
|
63 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/usage
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package openmesh provides CMake targets:
|
2 |
+
|
3 |
+
find_package(openmesh REQUIRED)
|
4 |
+
target_include_directories(main PRIVATE ${OPENMESH_INCLUDE_DIRS})
|
5 |
+
target_link_libraries(main PRIVATE ${OPENMESH_LIBRARIES})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/vcpkg-cmake-wrapper.cmake
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
include(FindPackageHandleStandardArgs)
|
2 |
+
include(SelectLibraryConfigurations)
|
3 |
+
|
4 |
+
find_path(OPENMESHCORE_INCLUDE_DIR EigenVectorT.hh PATH_SUFFIXES OpenMesh/Core/Geometry)
|
5 |
+
get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
|
6 |
+
get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
|
7 |
+
get_filename_component(OPENMESHCORE_INCLUDE_DIR ${OPENMESHCORE_INCLUDE_DIR} DIRECTORY)
|
8 |
+
|
9 |
+
find_library(OPENMESHCORE_LIBRARY_DEBUG NAMES OpenMeshCored libOpenMeshCored NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
|
10 |
+
find_library(OPENMESHCORE_LIBRARY_RELEASE NAMES OpenMeshCore libOpenMeshCore NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
|
11 |
+
find_library(OPENMESHTOOLS_LIBRARY_DEBUG NAMES OpenMeshToolsd libOpenMeshToolsd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
|
12 |
+
find_library(OPENMESHTOOLS_LIBRARY_RELEASE NAMES OpenMeshTools libOpenMeshTools NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
|
13 |
+
|
14 |
+
select_library_configurations(OPENMESHCORE)
|
15 |
+
select_library_configurations(OPENMESHTOOLS)
|
16 |
+
|
17 |
+
set(OPENMESH_INCLUDE_DIRS ${OPENMESHCORE_INCLUDE_DIR})
|
18 |
+
set(OPENMESH_LIBRARIES ${OPENMESHCORE_LIBRARY} ${OPENMESHTOOLS_LIBRARY})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmesh/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openmesh",
|
3 |
+
"version-string": "8.1",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "A generic and efficient polygon mesh data structure"
|
6 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/keep_isystem.patch
ADDED
@@ -0,0 +1,283 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/configure b/configure
|
2 |
+
index b2451c4..a7fb4da 100755
|
3 |
+
--- a/configure
|
4 |
+
+++ b/configure
|
5 |
+
@@ -19562,6 +19562,10 @@ $as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
|
6 |
+
opal_found=0
|
7 |
+
opal_i=`expr $opal_count + 1`
|
8 |
+
;;
|
9 |
+
+ -isystem)
|
10 |
+
+ opal_found=0
|
11 |
+
+ opal_i=`expr $opal_count + 1`
|
12 |
+
+ ;;
|
13 |
+
--param)
|
14 |
+
opal_found=0
|
15 |
+
opal_i=`expr $opal_count + 1`
|
16 |
+
@@ -19653,6 +19657,10 @@ $as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;}
|
17 |
+
opal_found=0
|
18 |
+
opal_i=`expr $opal_count + 1`
|
19 |
+
;;
|
20 |
+
+ -isystem)
|
21 |
+
+ opal_found=0
|
22 |
+
+ opal_i=`expr $opal_count + 1`
|
23 |
+
+ ;;
|
24 |
+
--param)
|
25 |
+
opal_found=0
|
26 |
+
opal_i=`expr $opal_count + 1`
|
27 |
+
@@ -19759,6 +19767,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on
|
28 |
+
opal_found=0
|
29 |
+
opal_i=`expr $opal_count + 1`
|
30 |
+
;;
|
31 |
+
+ -isystem)
|
32 |
+
+ opal_found=0
|
33 |
+
+ opal_i=`expr $opal_count + 1`
|
34 |
+
+ ;;
|
35 |
+
--param)
|
36 |
+
opal_found=0
|
37 |
+
opal_i=`expr $opal_count + 1`
|
38 |
+
@@ -19946,6 +19958,10 @@ $as_echo "$opal_cv_cc_wno_long_double" >&6; }
|
39 |
+
opal_found=0
|
40 |
+
opal_i=`expr $opal_count + 1`
|
41 |
+
;;
|
42 |
+
+ -isystem)
|
43 |
+
+ opal_found=0
|
44 |
+
+ opal_i=`expr $opal_count + 1`
|
45 |
+
+ ;;
|
46 |
+
--param)
|
47 |
+
opal_found=0
|
48 |
+
opal_i=`expr $opal_count + 1`
|
49 |
+
@@ -20127,6 +20143,10 @@ $as_echo "$opal_cv_cc_fno_strict_aliasing" >&6; }
|
50 |
+
opal_found=0
|
51 |
+
opal_i=`expr $opal_count + 1`
|
52 |
+
;;
|
53 |
+
+ -isystem)
|
54 |
+
+ opal_found=0
|
55 |
+
+ opal_i=`expr $opal_count + 1`
|
56 |
+
+ ;;
|
57 |
+
--param)
|
58 |
+
opal_found=0
|
59 |
+
opal_i=`expr $opal_count + 1`
|
60 |
+
@@ -20267,6 +20287,10 @@ $as_echo "$opal_cv_cc_restrict_cflags" >&6; }
|
61 |
+
opal_found=0
|
62 |
+
opal_i=`expr $opal_count + 1`
|
63 |
+
;;
|
64 |
+
+ -isystem)
|
65 |
+
+ opal_found=0
|
66 |
+
+ opal_i=`expr $opal_count + 1`
|
67 |
+
+ ;;
|
68 |
+
--param)
|
69 |
+
opal_found=0
|
70 |
+
opal_i=`expr $opal_count + 1`
|
71 |
+
@@ -26120,6 +26144,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on
|
72 |
+
opal_found=0
|
73 |
+
opal_i=`expr $opal_count + 1`
|
74 |
+
;;
|
75 |
+
+ -isystem)
|
76 |
+
+ opal_found=0
|
77 |
+
+ opal_i=`expr $opal_count + 1`
|
78 |
+
+ ;;
|
79 |
+
--param)
|
80 |
+
opal_found=0
|
81 |
+
opal_i=`expr $opal_count + 1`
|
82 |
+
@@ -26297,6 +26325,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
83 |
+
opal_found=0
|
84 |
+
opal_i=`expr $opal_count + 1`
|
85 |
+
;;
|
86 |
+
+ -isystem)
|
87 |
+
+ opal_found=0
|
88 |
+
+ opal_i=`expr $opal_count + 1`
|
89 |
+
+ ;;
|
90 |
+
--param)
|
91 |
+
opal_found=0
|
92 |
+
opal_i=`expr $opal_count + 1`
|
93 |
+
@@ -26441,6 +26473,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
94 |
+
opal_found=0
|
95 |
+
opal_i=`expr $opal_count + 1`
|
96 |
+
;;
|
97 |
+
+ -isystem)
|
98 |
+
+ opal_found=0
|
99 |
+
+ opal_i=`expr $opal_count + 1`
|
100 |
+
+ ;;
|
101 |
+
--param)
|
102 |
+
opal_found=0
|
103 |
+
opal_i=`expr $opal_count + 1`
|
104 |
+
@@ -27799,6 +27835,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on
|
105 |
+
opal_found=0
|
106 |
+
opal_i=`expr $opal_count + 1`
|
107 |
+
;;
|
108 |
+
+ -isystem)
|
109 |
+
+ opal_found=0
|
110 |
+
+ opal_i=`expr $opal_count + 1`
|
111 |
+
+ ;;
|
112 |
+
--param)
|
113 |
+
opal_found=0
|
114 |
+
opal_i=`expr $opal_count + 1`
|
115 |
+
@@ -27973,6 +28013,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
116 |
+
opal_found=0
|
117 |
+
opal_i=`expr $opal_count + 1`
|
118 |
+
;;
|
119 |
+
+ -isystem)
|
120 |
+
+ opal_found=0
|
121 |
+
+ opal_i=`expr $opal_count + 1`
|
122 |
+
+ ;;
|
123 |
+
--param)
|
124 |
+
opal_found=0
|
125 |
+
opal_i=`expr $opal_count + 1`
|
126 |
+
@@ -28117,6 +28161,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
127 |
+
opal_found=0
|
128 |
+
opal_i=`expr $opal_count + 1`
|
129 |
+
;;
|
130 |
+
+ -isystem)
|
131 |
+
+ opal_found=0
|
132 |
+
+ opal_i=`expr $opal_count + 1`
|
133 |
+
+ ;;
|
134 |
+
--param)
|
135 |
+
opal_found=0
|
136 |
+
opal_i=`expr $opal_count + 1`
|
137 |
+
@@ -44127,6 +44175,10 @@ fi
|
138 |
+
opal_found=0
|
139 |
+
opal_i=`expr $opal_count + 1`
|
140 |
+
;;
|
141 |
+
+ -isystem)
|
142 |
+
+ opal_found=0
|
143 |
+
+ opal_i=`expr $opal_count + 1`
|
144 |
+
+ ;;
|
145 |
+
--param)
|
146 |
+
opal_found=0
|
147 |
+
opal_i=`expr $opal_count + 1`
|
148 |
+
@@ -60612,6 +60664,10 @@ $as_echo_n "checking if intel compiler _Quad == REAL*16... " >&6; }
|
149 |
+
opal_found=0
|
150 |
+
opal_i=`expr $opal_count + 1`
|
151 |
+
;;
|
152 |
+
+ -isystem)
|
153 |
+
+ opal_found=0
|
154 |
+
+ opal_i=`expr $opal_count + 1`
|
155 |
+
+ ;;
|
156 |
+
--param)
|
157 |
+
opal_found=0
|
158 |
+
opal_i=`expr $opal_count + 1`
|
159 |
+
@@ -60842,6 +60898,10 @@ $as_echo_n "checking if gnu compiler __float128 == REAL*16... " >&6; }
|
160 |
+
opal_found=0
|
161 |
+
opal_i=`expr $opal_count + 1`
|
162 |
+
;;
|
163 |
+
+ -isystem)
|
164 |
+
+ opal_found=0
|
165 |
+
+ opal_i=`expr $opal_count + 1`
|
166 |
+
+ ;;
|
167 |
+
--param)
|
168 |
+
opal_found=0
|
169 |
+
opal_i=`expr $opal_count + 1`
|
170 |
+
diff --git a/opal/mca/pmix/pmix3x/pmix/configure b/opal/mca/pmix/pmix3x/pmix/configure
|
171 |
+
index 0326a68..07df146 100755
|
172 |
+
--- a/opal/mca/pmix/pmix3x/pmix/configure
|
173 |
+
+++ b/opal/mca/pmix/pmix3x/pmix/configure
|
174 |
+
@@ -19386,6 +19386,10 @@ $as_echo "$pmix_cv_cc_coverage" >&6; }
|
175 |
+
pmix_found=0
|
176 |
+
pmix_i=`expr $pmix_count + 1`
|
177 |
+
;;
|
178 |
+
+ -isystem)
|
179 |
+
+ pmix_found=0
|
180 |
+
+ pmix_i=`expr $pmix_count + 1`
|
181 |
+
+ ;;
|
182 |
+
--param)
|
183 |
+
pmix_found=0
|
184 |
+
pmix_i=`expr $pmix_count + 1`
|
185 |
+
@@ -19477,6 +19481,10 @@ $as_echo "$pmix_cv_cc_coverage" >&6; }
|
186 |
+
pmix_found=0
|
187 |
+
pmix_i=`expr $pmix_count + 1`
|
188 |
+
;;
|
189 |
+
+ -isystem)
|
190 |
+
+ pmix_found=0
|
191 |
+
+ pmix_i=`expr $pmix_count + 1`
|
192 |
+
+ ;;
|
193 |
+
--param)
|
194 |
+
pmix_found=0
|
195 |
+
pmix_i=`expr $pmix_count + 1`
|
196 |
+
@@ -19583,6 +19591,10 @@ $as_echo "$as_me: WARNING: Code coverage functionality is currently available on
|
197 |
+
pmix_found=0
|
198 |
+
pmix_i=`expr $pmix_count + 1`
|
199 |
+
;;
|
200 |
+
+ -isystem)
|
201 |
+
+ pmix_found=0
|
202 |
+
+ pmix_i=`expr $pmix_count + 1`
|
203 |
+
+ ;;
|
204 |
+
--param)
|
205 |
+
pmix_found=0
|
206 |
+
pmix_i=`expr $pmix_count + 1`
|
207 |
+
@@ -19770,6 +19782,10 @@ $as_echo "$pmix_cv_cc_wno_long_double" >&6; }
|
208 |
+
pmix_found=0
|
209 |
+
pmix_i=`expr $pmix_count + 1`
|
210 |
+
;;
|
211 |
+
+ -isystem)
|
212 |
+
+ pmix_found=0
|
213 |
+
+ pmix_i=`expr $pmix_count + 1`
|
214 |
+
+ ;;
|
215 |
+
--param)
|
216 |
+
pmix_found=0
|
217 |
+
pmix_i=`expr $pmix_count + 1`
|
218 |
+
@@ -19951,6 +19967,10 @@ $as_echo "$pmix_cv_cc_fno_strict_aliasing" >&6; }
|
219 |
+
pmix_found=0
|
220 |
+
pmix_i=`expr $pmix_count + 1`
|
221 |
+
;;
|
222 |
+
+ -isystem)
|
223 |
+
+ pmix_found=0
|
224 |
+
+ pmix_i=`expr $pmix_count + 1`
|
225 |
+
+ ;;
|
226 |
+
--param)
|
227 |
+
pmix_found=0
|
228 |
+
pmix_i=`expr $pmix_count + 1`
|
229 |
+
@@ -20091,6 +20111,10 @@ $as_echo "$pmix_cv_cc_restrict_cflags" >&6; }
|
230 |
+
pmix_found=0
|
231 |
+
pmix_i=`expr $pmix_count + 1`
|
232 |
+
;;
|
233 |
+
+ -isystem)
|
234 |
+
+ pmix_found=0
|
235 |
+
+ pmix_i=`expr $pmix_count + 1`
|
236 |
+
+ ;;
|
237 |
+
--param)
|
238 |
+
pmix_found=0
|
239 |
+
pmix_i=`expr $pmix_count + 1`
|
240 |
+
@@ -53914,6 +53938,10 @@ fi
|
241 |
+
pmix_found=0
|
242 |
+
pmix_i=`expr $pmix_count + 1`
|
243 |
+
;;
|
244 |
+
+ -isystem)
|
245 |
+
+ pmix_found=0
|
246 |
+
+ pmix_i=`expr $pmix_count + 1`
|
247 |
+
+ ;;
|
248 |
+
--param)
|
249 |
+
pmix_found=0
|
250 |
+
pmix_i=`expr $pmix_count + 1`
|
251 |
+
@@ -54005,6 +54033,10 @@ fi
|
252 |
+
pmix_found=0
|
253 |
+
pmix_i=`expr $pmix_count + 1`
|
254 |
+
;;
|
255 |
+
+ -isystem)
|
256 |
+
+ pmix_found=0
|
257 |
+
+ pmix_i=`expr $pmix_count + 1`
|
258 |
+
+ ;;
|
259 |
+
--param)
|
260 |
+
pmix_found=0
|
261 |
+
pmix_i=`expr $pmix_count + 1`
|
262 |
+
@@ -54096,6 +54128,10 @@ fi
|
263 |
+
pmix_found=0
|
264 |
+
pmix_i=`expr $pmix_count + 1`
|
265 |
+
;;
|
266 |
+
+ -isystem)
|
267 |
+
+ pmix_found=0
|
268 |
+
+ pmix_i=`expr $pmix_count + 1`
|
269 |
+
+ ;;
|
270 |
+
--param)
|
271 |
+
pmix_found=0
|
272 |
+
pmix_i=`expr $pmix_count + 1`
|
273 |
+
@@ -54187,6 +54223,10 @@ fi
|
274 |
+
pmix_found=0
|
275 |
+
pmix_i=`expr $pmix_count + 1`
|
276 |
+
;;
|
277 |
+
+ -isystem)
|
278 |
+
+ pmix_found=0
|
279 |
+
+ pmix_i=`expr $pmix_count + 1`
|
280 |
+
+ ;;
|
281 |
+
--param)
|
282 |
+
pmix_found=0
|
283 |
+
pmix_i=`expr $pmix_count + 1`
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/portfile.cmake
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
2 |
+
|
3 |
+
set(OpenMPI_FULL_VERSION "4.1.0")
|
4 |
+
set(OpenMPI_SHORT_VERSION "4.1")
|
5 |
+
|
6 |
+
vcpkg_download_distfile(ARCHIVE
|
7 |
+
URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
|
8 |
+
FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz"
|
9 |
+
SHA512 1f8117b11c5279d34194b4f5652b0223cf1258a4ac0efd40bab78f31f203068e027235a92a87e546b1b35c5b369bc90788b109c05a7068c75533a03649410e99
|
10 |
+
)
|
11 |
+
|
12 |
+
vcpkg_extract_source_archive_ex(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
ARCHIVE ${ARCHIVE}
|
15 |
+
PATCHES
|
16 |
+
keep_isystem.patch
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_find_acquire_program(PERL)
|
20 |
+
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
21 |
+
vcpkg_add_to_path(${PERL_PATH})
|
22 |
+
|
23 |
+
vcpkg_configure_make(
|
24 |
+
COPY_SOURCE
|
25 |
+
SOURCE_PATH ${SOURCE_PATH}
|
26 |
+
OPTIONS
|
27 |
+
--with-hwloc=internal
|
28 |
+
--with-libevent=internal
|
29 |
+
--disable-mpi-fortran
|
30 |
+
OPTIONS_DEBUG
|
31 |
+
--enable-debug
|
32 |
+
)
|
33 |
+
|
34 |
+
vcpkg_install_make(DISABLE_PARALLEL)
|
35 |
+
vcpkg_fixup_pkgconfig()
|
36 |
+
|
37 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
38 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
39 |
+
|
40 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmpi/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openmpi",
|
3 |
+
"version": "4.1.0",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.",
|
6 |
+
"homepage": "https://www.open-mpi.org/",
|
7 |
+
"supports": "!(windows | uwp)"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/0001-eigen_3.4.0.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp
|
2 |
+
index 2ffd45a..bbf74b4 100644
|
3 |
+
--- a/src/openMVG/multiview/solver_fundamental_kernel.cpp
|
4 |
+
+++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp
|
5 |
+
@@ -110,7 +110,7 @@ void EightPointSolver::Solve
|
6 |
+
x2.colwise().homogeneous(),
|
7 |
+
&epipolar_constraint);
|
8 |
+
// Find the F matrice in the nullspace of epipolar_constraint.
|
9 |
+
- Eigen::SelfAdjointEigenSolver<Mat9> solver
|
10 |
+
+ Eigen::SelfAdjointEigenSolver<Eigen::Matrix<double, 9, 9>> solver
|
11 |
+
(epipolar_constraint.transpose() * epipolar_constraint);
|
12 |
+
f = solver.eigenvectors().leftCols<1>();
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/0002-eigen-3.4.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/src/openMVG/multiview/CMakeLists.txt
|
2 |
+
+++ b/src/openMVG/multiview/CMakeLists.txt
|
3 |
+
@@ -38,6 +38,9 @@ target_include_directories(openMVG_multiview
|
4 |
+
$<INSTALL_INTERFACE:include>
|
5 |
+
)
|
6 |
+
set_target_properties(openMVG_multiview PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}")
|
7 |
+
+if (MSVC)
|
8 |
+
+ set_target_properties(openMVG_multiview PROPERTIES COMPILE_FLAGS "/bigobj")
|
9 |
+
+endif (MSVC)
|
10 |
+
|
11 |
+
add_library(openMVG_multiview_test_data ${MULTIVIEWTESTDATA})
|
12 |
+
target_link_libraries(openMVG_multiview_test_data PRIVATE openMVG_numeric openMVG_multiview)
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/build_fixes.patch
ADDED
@@ -0,0 +1,763 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2 |
+
index 5d909ec..ab7eb6f 100644
|
3 |
+
--- a/src/CMakeLists.txt
|
4 |
+
+++ b/src/CMakeLists.txt
|
5 |
+
@@ -20,6 +20,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
6 |
+
message(FATAL_ERROR "In-source builds not allowed.")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
+if(0)
|
10 |
+
# ==============================================================================
|
11 |
+
# OpenMVG build options
|
12 |
+
# ==============================================================================
|
13 |
+
@@ -37,6 +38,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
|
14 |
+
# and openMVG simultaneously
|
15 |
+
# ==============================================================================
|
16 |
+
option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
|
17 |
+
+endif()
|
18 |
+
|
19 |
+
# ==============================================================================
|
20 |
+
# Since OpenCV 3, SIFT is no longer in the default modules. See
|
21 |
+
@@ -95,6 +97,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
22 |
+
register_definitions(-DOPENMVG_STD_UNORDERED_MAP)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
+if(0)
|
26 |
+
# ==============================================================================
|
27 |
+
# Check that submodule have been initialized and updated
|
28 |
+
# ==============================================================================
|
29 |
+
@@ -103,6 +106,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
|
30 |
+
"\n submodule(s) are missing, please update your repository:\n"
|
31 |
+
" > git submodule update -i\n")
|
32 |
+
endif()
|
33 |
+
+endif()
|
34 |
+
|
35 |
+
# ==============================================================================
|
36 |
+
# Additional cmake find modules
|
37 |
+
@@ -138,7 +142,6 @@ if (OpenMVG_USE_OPENMP)
|
38 |
+
find_package(OpenMP)
|
39 |
+
if (OPENMP_FOUND)
|
40 |
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
41 |
+
- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON)
|
42 |
+
register_definitions(-DOPENMVG_USE_OPENMP)
|
43 |
+
if (NOT MSVC)
|
44 |
+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
45 |
+
@@ -149,11 +152,6 @@ if (OpenMVG_USE_OPENMP)
|
46 |
+
endif()
|
47 |
+
endif (NOT MSVC)
|
48 |
+
endif (OPENMP_FOUND)
|
49 |
+
-else (OpenMVG_USE_OPENMP)
|
50 |
+
- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF)
|
51 |
+
- include(UpdateCacheVariable)
|
52 |
+
- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF)
|
53 |
+
- remove_definitions(-DOPENMVG_USE_OPENMP)
|
54 |
+
endif (OpenMVG_USE_OPENMP)
|
55 |
+
|
56 |
+
# ==============================================================================
|
57 |
+
@@ -170,9 +168,10 @@ endif()
|
58 |
+
# ==============================================================================
|
59 |
+
# IMAGE IO detection
|
60 |
+
# ==============================================================================
|
61 |
+
-find_package(JPEG QUIET)
|
62 |
+
-find_package(PNG QUIET)
|
63 |
+
-find_package(TIFF QUIET)
|
64 |
+
+find_package(JPEG REQUIRED)
|
65 |
+
+find_package(PNG REQUIRED)
|
66 |
+
+find_package(TIFF REQUIRED)
|
67 |
+
+find_package(vlfeat REQUIRED)
|
68 |
+
|
69 |
+
# Folders
|
70 |
+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
71 |
+
@@ -192,6 +191,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
|
72 |
+
set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw)
|
73 |
+
endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
|
74 |
+
|
75 |
+
+if(0)
|
76 |
+
# Dependencies install rules
|
77 |
+
install(
|
78 |
+
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
|
79 |
+
@@ -199,6 +199,7 @@ install(
|
80 |
+
COMPONENT headers
|
81 |
+
FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
|
82 |
+
)
|
83 |
+
+endif()
|
84 |
+
|
85 |
+
# ==============================================================================
|
86 |
+
# --END-- SUBMODULE CONFIGURATION
|
87 |
+
@@ -235,6 +236,7 @@ ENDMACRO(UNIT_TEST)
|
88 |
+
# - external by default
|
89 |
+
# - internal if cereal not found
|
90 |
+
# ==============================================================================
|
91 |
+
+if(0)
|
92 |
+
find_package(cereal QUIET CONFIG)
|
93 |
+
if (NOT TARGET cereal)
|
94 |
+
add_library(cereal INTERFACE)
|
95 |
+
@@ -247,7 +249,11 @@ if (NOT TARGET cereal)
|
96 |
+
|
97 |
+
set(OpenMVG_USE_INTERNAL_CEREAL ON)
|
98 |
+
endif()
|
99 |
+
+endif()
|
100 |
+
|
101 |
+
+find_package(cereal REQUIRED CONFIG)
|
102 |
+
+get_target_property(CEREAL_INCLUDE_DIRS cereal::cereal INTERFACE_INCLUDE_DIRECTORIES)
|
103 |
+
+
|
104 |
+
# ==============================================================================
|
105 |
+
# Eigen
|
106 |
+
# ==============================================================================
|
107 |
+
@@ -255,6 +261,7 @@ endif()
|
108 |
+
# - external if EIGEN_INCLUDE_DIR_HINTS is defined
|
109 |
+
# - internal if Eigen not found
|
110 |
+
# ==============================================================================
|
111 |
+
+if(0)
|
112 |
+
find_package(Eigen3 QUIET)
|
113 |
+
if (NOT Eigen3_FOUND)
|
114 |
+
set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
|
115 |
+
@@ -263,6 +270,10 @@ if (NOT Eigen3_FOUND)
|
116 |
+
else()
|
117 |
+
set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
|
118 |
+
endif()
|
119 |
+
+endif()
|
120 |
+
+
|
121 |
+
+find_package(Eigen3 REQUIRED)
|
122 |
+
+set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
|
123 |
+
|
124 |
+
# ==============================================================================
|
125 |
+
# Ceres
|
126 |
+
@@ -270,6 +281,7 @@ endif()
|
127 |
+
# - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
|
128 |
+
# - internal if ceres not found (ceres-solver+cxsparse+miniglog)
|
129 |
+
# ==============================================================================
|
130 |
+
+if(0)
|
131 |
+
find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
|
132 |
+
if (NOT Ceres_FOUND)
|
133 |
+
set(OpenMVG_USE_INTERNAL_CERES ON)
|
134 |
+
@@ -281,6 +293,9 @@ if (NOT Ceres_FOUND)
|
135 |
+
STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG})
|
136 |
+
set(CERES_LIBRARIES openMVG_ceres)
|
137 |
+
endif()
|
138 |
+
+endif()
|
139 |
+
+
|
140 |
+
+find_package(Ceres REQUIRED)
|
141 |
+
|
142 |
+
# ==============================================================================
|
143 |
+
# Flann
|
144 |
+
@@ -288,6 +303,7 @@ endif()
|
145 |
+
# - internal by default (flann),
|
146 |
+
# - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found
|
147 |
+
# ==============================================================================
|
148 |
+
+if(0)
|
149 |
+
if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
|
150 |
+
set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
|
151 |
+
set(OpenMVG_USE_INTERNAL_FLANN ON)
|
152 |
+
@@ -296,6 +312,9 @@ find_package(Flann QUIET)
|
153 |
+
if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
|
154 |
+
set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
|
155 |
+
endif()
|
156 |
+
+endif()
|
157 |
+
+
|
158 |
+
+find_package(flann REQUIRED)
|
159 |
+
|
160 |
+
# ==============================================================================
|
161 |
+
# CoinUtils
|
162 |
+
@@ -303,6 +322,7 @@ endif()
|
163 |
+
# - internal by default (CoinUtils),
|
164 |
+
# - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found
|
165 |
+
# ==============================================================================
|
166 |
+
+if(0)
|
167 |
+
if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
|
168 |
+
set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
|
169 |
+
set(OpenMVG_USE_INTERNAL_COINUTILS ON)
|
170 |
+
@@ -312,6 +332,9 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
|
171 |
+
else()
|
172 |
+
find_package(CoinUtils QUIET)
|
173 |
+
endif()
|
174 |
+
+endif()
|
175 |
+
+
|
176 |
+
+find_package(CoinUtils REQUIRED)
|
177 |
+
|
178 |
+
## ==============================================================================
|
179 |
+
## Clp
|
180 |
+
@@ -319,6 +342,7 @@ endif()
|
181 |
+
## - internal by default (Clp),
|
182 |
+
## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found
|
183 |
+
## ==============================================================================
|
184 |
+
+if(0)
|
185 |
+
if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
|
186 |
+
set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/)
|
187 |
+
set(OpenMVG_USE_INTERNAL_CLP ON)
|
188 |
+
@@ -330,13 +354,17 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
|
189 |
+
else()
|
190 |
+
find_package(Clp QUIET)
|
191 |
+
endif()
|
192 |
+
+endif()
|
193 |
+
|
194 |
+
+find_package(Clp REQUIRED)
|
195 |
+
+
|
196 |
+
# ==============================================================================
|
197 |
+
# Osi
|
198 |
+
# ==============================================================================
|
199 |
+
# - internal by default (Osi),
|
200 |
+
# - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found
|
201 |
+
# ==============================================================================
|
202 |
+
+if(0)
|
203 |
+
if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
|
204 |
+
set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/)
|
205 |
+
set(OpenMVG_USE_INTERNAL_OSI ON)
|
206 |
+
@@ -346,6 +374,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
|
207 |
+
else()
|
208 |
+
find_package(Osi QUIET)
|
209 |
+
endif()
|
210 |
+
+endif()
|
211 |
+
+
|
212 |
+
+find_package(Osi REQUIRED)
|
213 |
+
|
214 |
+
# ==============================================================================
|
215 |
+
# Internal CLP/OSI/COINUTILS libraries:
|
216 |
+
@@ -364,6 +395,7 @@ endif()
|
217 |
+
# - internal by default (Lemon),
|
218 |
+
# - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found
|
219 |
+
# ==============================================================================
|
220 |
+
+if(0)
|
221 |
+
if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
|
222 |
+
set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
|
223 |
+
set(OpenMVG_USE_INTERNAL_LEMON ON)
|
224 |
+
@@ -374,6 +406,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
|
225 |
+
${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon
|
226 |
+
${PROJECT_BINARY_DIR}/third_party/lemon)
|
227 |
+
endif()
|
228 |
+
+endif()
|
229 |
+
+
|
230 |
+
+find_package(LEMON REQUIRED)
|
231 |
+
|
232 |
+
# ==============================================================================
|
233 |
+
# OpenCV
|
234 |
+
@@ -381,12 +416,7 @@ endif()
|
235 |
+
# - only external and enabled only if OpenMVG_USE_OPENCV is set to ON
|
236 |
+
# ==============================================================================
|
237 |
+
if (OpenMVG_USE_OPENCV)
|
238 |
+
- find_package( OpenCV QUIET )
|
239 |
+
- if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0")
|
240 |
+
- message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.")
|
241 |
+
- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF)
|
242 |
+
- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF)
|
243 |
+
- endif()
|
244 |
+
+ find_package( OpenCV REQUIRED )
|
245 |
+
endif()
|
246 |
+
|
247 |
+
|
248 |
+
@@ -394,7 +424,6 @@ endif()
|
249 |
+
# Third-party libraries:
|
250 |
+
# ==============================================================================
|
251 |
+
add_subdirectory(third_party)
|
252 |
+
-add_subdirectory(testing)
|
253 |
+
|
254 |
+
# ==============================================================================
|
255 |
+
# openMVG modules
|
256 |
+
@@ -481,67 +510,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
|
257 |
+
|
258 |
+
message("\n")
|
259 |
+
|
260 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_CEREAL)
|
261 |
+
+if (OpenMVG_USE_INTERNAL_CEREAL)
|
262 |
+
message(STATUS "CEREAL: (internal)")
|
263 |
+
else()
|
264 |
+
message(STATUS "CEREAL: (external)")
|
265 |
+
endif()
|
266 |
+
|
267 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
|
268 |
+
+if (OpenMVG_USE_INTERNAL_EIGEN)
|
269 |
+
message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)")
|
270 |
+
else()
|
271 |
+
message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)")
|
272 |
+
endif()
|
273 |
+
|
274 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
|
275 |
+
+if (OpenMVG_USE_INTERNAL_CERES)
|
276 |
+
message(STATUS "CERES: " ${CERES_VERSION} " (internal)")
|
277 |
+
else()
|
278 |
+
message(STATUS "CERES: " ${CERES_VERSION} " (external)")
|
279 |
+
endif()
|
280 |
+
|
281 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
|
282 |
+
+if (OpenMVG_USE_INTERNAL_FLANN)
|
283 |
+
message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)")
|
284 |
+
else()
|
285 |
+
message(STATUS "FLANN: " ${FLANN_VERSION} " (external)")
|
286 |
+
endif()
|
287 |
+
|
288 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_TIFF)
|
289 |
+
+if (OpenMVG_USE_INTERNAL_TIFF)
|
290 |
+
message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)")
|
291 |
+
else()
|
292 |
+
message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)")
|
293 |
+
endif()
|
294 |
+
|
295 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_PNG)
|
296 |
+
+if (OpenMVG_USE_INTERNAL_PNG)
|
297 |
+
message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)")
|
298 |
+
else()
|
299 |
+
message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)")
|
300 |
+
endif()
|
301 |
+
|
302 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_JPEG)
|
303 |
+
+if (OpenMVG_USE_INTERNAL_JPEG)
|
304 |
+
message(STATUS "LIBJPEG (internal)")
|
305 |
+
else()
|
306 |
+
message(STATUS "LIBJPEG (external)")
|
307 |
+
endif()
|
308 |
+
|
309 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_CLP)
|
310 |
+
+if (OpenMVG_USE_INTERNAL_CLP)
|
311 |
+
message(STATUS "CLP: " ${CLP_VERSION} " (internal)")
|
312 |
+
else()
|
313 |
+
message(STATUS "CLP: " ${CLP_VERSION} " (external)")
|
314 |
+
endif()
|
315 |
+
|
316 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS)
|
317 |
+
+if (OpenMVG_USE_INTERNAL_COINUTILS)
|
318 |
+
message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)")
|
319 |
+
else()
|
320 |
+
message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)")
|
321 |
+
endif()
|
322 |
+
|
323 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_OSI)
|
324 |
+
+if (OpenMVG_USE_INTERNAL_OSI)
|
325 |
+
message(STATUS "OSI: " ${OSI_VERSION} " (internal)")
|
326 |
+
else()
|
327 |
+
message(STATUS "OSI: " ${OSI_VERSION} " (external)")
|
328 |
+
endif()
|
329 |
+
|
330 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_LEMON)
|
331 |
+
+if (OpenMVG_USE_INTERNAL_LEMON)
|
332 |
+
message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)")
|
333 |
+
else()
|
334 |
+
message(STATUS "LEMON: " ${LEMON_VERSION} " (external)")
|
335 |
+
diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
|
336 |
+
index 8a69c23..6ebc661 100644
|
337 |
+
--- a/src/cmakeFindModules/FindClp.cmake
|
338 |
+
+++ b/src/cmakeFindModules/FindClp.cmake
|
339 |
+
@@ -50,8 +50,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
|
340 |
+
ENDIF (NOT EXISTS ${CLP_VERSION_FILE})
|
341 |
+
SET(CLP_INCLUDE_DIR ${CLP_DIR})
|
342 |
+
|
343 |
+
- FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
|
344 |
+
- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
|
345 |
+
+ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
|
346 |
+
+ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
|
347 |
+
FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
|
348 |
+
|
349 |
+
# locate Clp libraries
|
350 |
+
diff --git a/src/cmakeFindModules/OpenMVGConfig.cmake.in b/src/cmakeFindModules/OpenMVGConfig.cmake.in
|
351 |
+
index e7dfbfd..65224c4 100644
|
352 |
+
--- a/src/cmakeFindModules/OpenMVGConfig.cmake.in
|
353 |
+
+++ b/src/cmakeFindModules/OpenMVGConfig.cmake.in
|
354 |
+
@@ -19,7 +19,7 @@
|
355 |
+
# OPENMVG_VERSION: Version of OpenMVG found.
|
356 |
+
#
|
357 |
+
|
358 |
+
-# Called if we failed to find OpenMVG or any of it's required dependencies,
|
359 |
+
+# Called if we failed to find OpenMVG or any of its required dependencies,
|
360 |
+
# unsets all public (designed to be used externally) variables and reports
|
361 |
+
# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
|
362 |
+
macro(OPENMVG_REPORT_NOT_FOUND REASON_MSG)
|
363 |
+
@@ -58,10 +58,20 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
|
364 |
+
# Reset CMake module path to the installation directory of this
|
365 |
+
# script.
|
366 |
+
set(CMAKE_MODULE_PATH ${CURRENT_CONFIG_INSTALL_DIR})
|
367 |
+
+include(CMakeFindDependencyMacro)
|
368 |
+
+
|
369 |
+
+find_dependency(CoinUtils)
|
370 |
+
+find_dependency(Clp)
|
371 |
+
+find_dependency(Osi)
|
372 |
+
+find_dependency(flann)
|
373 |
+
+find_dependency(Threads)
|
374 |
+
+find_dependency(cereal)
|
375 |
+
+find_dependency(Ceres)
|
376 |
+
+find_dependency(vlfeat)
|
377 |
+
|
378 |
+
# Build the absolute root install directory as a relative path
|
379 |
+
get_filename_component(CURRENT_ROOT_INSTALL_DIR
|
380 |
+
- ${CMAKE_MODULE_PATH}/../../../ ABSOLUTE)
|
381 |
+
+ ${CMAKE_MODULE_PATH}/../../ ABSOLUTE)
|
382 |
+
if (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR})
|
383 |
+
OPENMVG_REPORT_NOT_FOUND(
|
384 |
+
"OpenMVG install root: ${CURRENT_ROOT_INSTALL_DIR}, "
|
385 |
+
diff --git a/src/nonFree/sift/CMakeLists.txt b/src/nonFree/sift/CMakeLists.txt
|
386 |
+
index 402a2d8..60ddc11 100644
|
387 |
+
--- a/src/nonFree/sift/CMakeLists.txt
|
388 |
+
+++ b/src/nonFree/sift/CMakeLists.txt
|
389 |
+
@@ -1,36 +1,36 @@
|
390 |
+
|
391 |
+
-# libs should be static
|
392 |
+
-set(BUILD_SHARED_LIBS OFF)
|
393 |
+
-
|
394 |
+
-# use PIC code for link into shared lib
|
395 |
+
-if(UNIX)
|
396 |
+
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
|
397 |
+
-endif(UNIX)
|
398 |
+
-
|
399 |
+
-if(NOT USE_SSE2)
|
400 |
+
- add_definitions(-DVL_DISABLE_SSE2)
|
401 |
+
-endif()
|
402 |
+
-
|
403 |
+
-add_definitions(-DVL_DISABLE_THREADS)
|
404 |
+
-
|
405 |
+
-include_directories(./vl)
|
406 |
+
-set(FEATS
|
407 |
+
- vl/generic.c
|
408 |
+
- vl/imopv_sse2.c
|
409 |
+
- vl/sift.c
|
410 |
+
- vl/imopv.c
|
411 |
+
- vl/mathop_sse2.c
|
412 |
+
- vl/sift.c
|
413 |
+
- vl/host.c
|
414 |
+
- vl/mathop.c
|
415 |
+
- vl/random.c)
|
416 |
+
-set_source_files_properties(${FEATS} PROPERTIES LANGUAGE C)
|
417 |
+
-add_library(vlsift ${FEATS})
|
418 |
+
-install(TARGETS vlsift DESTINATION lib EXPORT openMVG-targets)
|
419 |
+
-set_property(TARGET vlsift PROPERTY FOLDER OpenMVG/nonFree)
|
420 |
+
+## libs should be static
|
421 |
+
+#set(BUILD_SHARED_LIBS OFF)
|
422 |
+
+#
|
423 |
+
+## use PIC code for link into shared lib
|
424 |
+
+#if(UNIX)
|
425 |
+
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
|
426 |
+
+#endif(UNIX)
|
427 |
+
+#
|
428 |
+
+#if(NOT USE_SSE2)
|
429 |
+
+# add_definitions(-DVL_DISABLE_SSE2)
|
430 |
+
+#endif()
|
431 |
+
+#
|
432 |
+
+#add_definitions(-DVL_DISABLE_THREADS)
|
433 |
+
+#
|
434 |
+
+#include_directories(./vl)
|
435 |
+
+#set(FEATS
|
436 |
+
+# vl/generic.c
|
437 |
+
+# vl/imopv_sse2.c
|
438 |
+
+# vl/sift.c
|
439 |
+
+# vl/imopv.c
|
440 |
+
+# vl/mathop_sse2.c
|
441 |
+
+# vl/sift.c
|
442 |
+
+# vl/host.c
|
443 |
+
+# vl/mathop.c
|
444 |
+
+# vl/random.c)
|
445 |
+
+#set_source_files_properties(${FEATS} PROPERTIES LANGUAGE C)
|
446 |
+
+#add_library(vlsift ${FEATS})
|
447 |
+
+#install(TARGETS vlsift DESTINATION lib EXPORT openMVG-targets)
|
448 |
+
+#set_property(TARGET vlsift PROPERTY FOLDER OpenMVG/nonFree)
|
449 |
+
install(
|
450 |
+
DIRECTORY .
|
451 |
+
DESTINATION include/openMVG_dependencies/nonFree/sift
|
452 |
+
COMPONENT headers
|
453 |
+
- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
|
454 |
+
+ FILES_MATCHING PATTERN "*.hpp"
|
455 |
+
)
|
456 |
+
diff --git a/src/nonFree/sift/SIFT_describer.hpp b/src/nonFree/sift/SIFT_describer.hpp
|
457 |
+
index cd800b0..20e9c8e 100644
|
458 |
+
--- a/src/nonFree/sift/SIFT_describer.hpp
|
459 |
+
+++ b/src/nonFree/sift/SIFT_describer.hpp
|
460 |
+
@@ -17,9 +17,7 @@
|
461 |
+
#include <iostream>
|
462 |
+
#include <numeric>
|
463 |
+
|
464 |
+
-extern "C" {
|
465 |
+
-#include "nonFree/sift/vl/sift.h"
|
466 |
+
-}
|
467 |
+
+#include <sift.h>
|
468 |
+
|
469 |
+
namespace openMVG {
|
470 |
+
namespace features {
|
471 |
+
@@ -174,7 +172,7 @@ public:
|
472 |
+
const int nkeys = vl_sift_get_nkeypoints(filt);
|
473 |
+
|
474 |
+
// Update gradient before launching parallel extraction
|
475 |
+
- vl_sift_update_gradient(filt);
|
476 |
+
+ update_gradient(filt);
|
477 |
+
|
478 |
+
#ifdef OPENMVG_USE_OPENMP
|
479 |
+
#pragma omp parallel for private(descr, descriptor)
|
480 |
+
diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt
|
481 |
+
index cc5212f..acc57dd 100644
|
482 |
+
--- a/src/openMVG/linearProgramming/CMakeLists.txt
|
483 |
+
+++ b/src/openMVG/linearProgramming/CMakeLists.txt
|
484 |
+
@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming
|
485 |
+
PUBLIC
|
486 |
+
openMVG_numeric
|
487 |
+
PRIVATE
|
488 |
+
- ${CLP_LIBRARIES} # clp + solver wrapper
|
489 |
+
- ${COINUTILS_LIBRARY} # container tools
|
490 |
+
- ${OSI_LIBRARY} # generic LP
|
491 |
+
+ Coin::Clp # clp + solver wrapper
|
492 |
+
+ Coin::CoinUtils # container tools
|
493 |
+
+ Coin::Osi # generic LP
|
494 |
+
)
|
495 |
+
|
496 |
+
target_include_directories(openMVG_linearProgramming
|
497 |
+
- PRIVATE
|
498 |
+
- ${CLP_INCLUDE_DIRS}
|
499 |
+
- ${COINUTILS_INCLUDE_DIRS}
|
500 |
+
- ${OSI_INCLUDE_DIRS}
|
501 |
+
PUBLIC
|
502 |
+
$<INSTALL_INTERFACE:include>
|
503 |
+
)
|
504 |
+
diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
|
505 |
+
index 2e0eafd7..d54d1e88 100644
|
506 |
+
--- a/src/openMVG/matching/CMakeLists.txt
|
507 |
+
+++ b/src/openMVG/matching/CMakeLists.txt
|
508 |
+
@@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
|
509 |
+
|
510 |
+
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
511 |
+
find_package(Threads REQUIRED)
|
512 |
+
+find_package(flann CONFIG REQUIRED)
|
513 |
+
|
514 |
+
set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
|
515 |
+
add_library(openMVG_matching
|
516 |
+
@@ -35,12 +36,12 @@ target_link_libraries(openMVG_matching
|
517 |
+
PUBLIC
|
518 |
+
openMVG_features
|
519 |
+
Threads::Threads
|
520 |
+
- cereal
|
521 |
+
+ cereal::cereal
|
522 |
+
)
|
523 |
+
-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
|
524 |
+
+if (NOT OpenMVG_USE_INTERNAL_FLANN)
|
525 |
+
target_link_libraries(openMVG_matching
|
526 |
+
PUBLIC
|
527 |
+
- ${FLANN_LIBRARIES}
|
528 |
+
+ $<IF:$<TARGET_EXISTS:flann::flann_s>,flann::flann_s,flann::flann>
|
529 |
+
)
|
530 |
+
endif()
|
531 |
+
set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}")
|
532 |
+
diff --git a/src/openMVG/numeric/CMakeLists.txt b/src/openMVG/numeric/CMakeLists.txt
|
533 |
+
index 1f3fc30..4097320 100644
|
534 |
+
--- a/src/openMVG/numeric/CMakeLists.txt
|
535 |
+
+++ b/src/openMVG/numeric/CMakeLists.txt
|
536 |
+
@@ -26,7 +26,7 @@ target_include_directories(openMVG_numeric
|
537 |
+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
|
538 |
+
$<INSTALL_INTERFACE:include>
|
539 |
+
)
|
540 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
|
541 |
+
+if (OpenMVG_USE_INTERNAL_EIGEN)
|
542 |
+
target_include_directories(openMVG_numeric PUBLIC
|
543 |
+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen/>)
|
544 |
+
else()
|
545 |
+
diff --git a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
|
546 |
+
index 862ffc7..62508af 100644
|
547 |
+
--- a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
|
548 |
+
+++ b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
|
549 |
+
@@ -18,8 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES)
|
550 |
+
add_executable( openMVG_sample_describe_and_match_GUI WIN32 ${FEATURES_PAIR_DEMO_SRCS} ${FEATURES_PAIR_DEMO_HDRS} )
|
551 |
+
endif( APPLE )
|
552 |
+
|
553 |
+
- target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching vlsift )
|
554 |
+
-
|
555 |
+
+ target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching unofficial::vlfeat::vl )
|
556 |
+
set_target_properties( openMVG_sample_describe_and_match_GUI PROPERTIES CXX_STANDARD 11)
|
557 |
+
|
558 |
+
set_property(TARGET openMVG_sample_describe_and_match_GUI PROPERTY FOLDER OpenMVG/Samples)
|
559 |
+
diff --git a/src/openMVG_Samples/features_image_matching/CMakeLists.txt b/src/openMVG_Samples/features_image_matching/CMakeLists.txt
|
560 |
+
index 18fb385..d44ffce 100644
|
561 |
+
--- a/src/openMVG_Samples/features_image_matching/CMakeLists.txt
|
562 |
+
+++ b/src/openMVG_Samples/features_image_matching/CMakeLists.txt
|
563 |
+
@@ -5,7 +5,7 @@ target_link_libraries(openMVG_sample_image_matching
|
564 |
+
openMVG_features
|
565 |
+
openMVG_matching
|
566 |
+
${STLPLUS_LIBRARY}
|
567 |
+
- vlsift)
|
568 |
+
+ unofficial::vlfeat::vl)
|
569 |
+
target_compile_definitions(openMVG_sample_image_matching
|
570 |
+
PRIVATE -DTHIS_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
|
571 |
+
|
572 |
+
diff --git a/src/openMVG_Samples/features_repeatability/CMakeLists.txt b/src/openMVG_Samples/features_repeatability/CMakeLists.txt
|
573 |
+
index fd2b7c6..91f2766 100644
|
574 |
+
--- a/src/openMVG_Samples/features_repeatability/CMakeLists.txt
|
575 |
+
+++ b/src/openMVG_Samples/features_repeatability/CMakeLists.txt
|
576 |
+
@@ -6,7 +6,7 @@ target_link_libraries(openMVG_sample_main_features_repeatability_dataset
|
577 |
+
openMVG_matching
|
578 |
+
openMVG_system
|
579 |
+
openMVG_multiview
|
580 |
+
- vlsift
|
581 |
+
+ unofficial::vlfeat::vl
|
582 |
+
${STLPLUS_LIBRARY})
|
583 |
+
|
584 |
+
set_property(TARGET openMVG_sample_main_features_repeatability_dataset PROPERTY FOLDER OpenMVG/Samples)
|
585 |
+
diff --git a/src/software/Localization/CMakeLists.txt b/src/software/Localization/CMakeLists.txt
|
586 |
+
index 2f60393..0d57d0a 100644
|
587 |
+
--- a/src/software/Localization/CMakeLists.txt
|
588 |
+
+++ b/src/software/Localization/CMakeLists.txt
|
589 |
+
@@ -11,7 +11,7 @@ target_link_libraries(openMVG_main_SfM_Localization
|
590 |
+
openMVG_sfm
|
591 |
+
openMVG_exif
|
592 |
+
${STLPLUS_LIBRARY}
|
593 |
+
- vlsift
|
594 |
+
+ unofficial::vlfeat::vl
|
595 |
+
)
|
596 |
+
|
597 |
+
# Installation rules
|
598 |
+
diff --git a/src/software/SfM/CMakeLists.txt b/src/software/SfM/CMakeLists.txt
|
599 |
+
index 6db7e83..51e06f5 100644
|
600 |
+
--- a/src/software/SfM/CMakeLists.txt
|
601 |
+
+++ b/src/software/SfM/CMakeLists.txt
|
602 |
+
@@ -44,7 +44,7 @@ target_link_libraries(openMVG_main_ComputeFeatures
|
603 |
+
openMVG_multiview
|
604 |
+
openMVG_sfm
|
605 |
+
${STLPLUS_LIBRARY}
|
606 |
+
- vlsift
|
607 |
+
+ unofficial::vlfeat::vl
|
608 |
+
)
|
609 |
+
if (MSVC)
|
610 |
+
set_target_properties(openMVG_main_ComputeFeatures PROPERTIES COMPILE_FLAGS "/bigobj")
|
611 |
+
@@ -275,7 +275,7 @@ if(OpenMVG_USE_OPENCV)
|
612 |
+
openMVG_multiview
|
613 |
+
openMVG_sfm
|
614 |
+
${STLPLUS_LIBRARY}
|
615 |
+
- vlsift
|
616 |
+
+ unofficial::vlfeat::vl
|
617 |
+
${OpenCV_LIBS})
|
618 |
+
target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS})
|
619 |
+
|
620 |
+
diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in
|
621 |
+
index 42b41cc..7fda0cd 100644
|
622 |
+
--- a/src/software/SfM/SfM_GlobalPipeline.py.in
|
623 |
+
+++ b/src/software/SfM/SfM_GlobalPipeline.py.in
|
624 |
+
@@ -21,7 +21,7 @@
|
625 |
+
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
626 |
+
|
627 |
+
# Indicate the openMVG camera sensor width directory
|
628 |
+
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
629 |
+
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
630 |
+
|
631 |
+
import os
|
632 |
+
import subprocess
|
633 |
+
diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in
|
634 |
+
index 423c85c..0ff2e77 100644
|
635 |
+
--- a/src/software/SfM/SfM_SequentialPipeline.py.in
|
636 |
+
+++ b/src/software/SfM/SfM_SequentialPipeline.py.in
|
637 |
+
@@ -21,7 +21,7 @@
|
638 |
+
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
639 |
+
|
640 |
+
# Indicate the openMVG camera sensor width directory
|
641 |
+
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
642 |
+
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
643 |
+
|
644 |
+
import os
|
645 |
+
import subprocess
|
646 |
+
diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in
|
647 |
+
index c7361f3..1c56aab 100644
|
648 |
+
--- a/src/software/SfM/tutorial_demo.py.in
|
649 |
+
+++ b/src/software/SfM/tutorial_demo.py.in
|
650 |
+
@@ -12,7 +12,7 @@
|
651 |
+
OPENMVG_SFM_BIN = "@OPENMVG_SOFTWARE_SFM_BUILD_DIR@"
|
652 |
+
|
653 |
+
# Indicate the openMVG camera sensor width directory
|
654 |
+
-CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_SOFTWARE_SFM_SRC_DIR@" + "/../../openMVG/exif/sensor_width_database"
|
655 |
+
+CAMERA_SENSOR_WIDTH_DIRECTORY = "@OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY@"
|
656 |
+
|
657 |
+
import os
|
658 |
+
import subprocess
|
659 |
+
diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp
|
660 |
+
index aa7dffe..2c4d237 100644
|
661 |
+
--- a/src/software/VO/Tracker_opencv_klt.hpp
|
662 |
+
+++ b/src/software/VO/Tracker_opencv_klt.hpp
|
663 |
+
@@ -80,7 +80,7 @@ struct Tracker_opencv_KLT : public Abstract_Tracker
|
664 |
+
std::vector<cv::KeyPoint> m_nextKeypoints;
|
665 |
+
|
666 |
+
cv::Ptr<cv::FeatureDetector> m_detector = cv::GFTTDetector::create(count);
|
667 |
+
- if (m_detector == NULL)
|
668 |
+
+ if (m_detector == nullptr)
|
669 |
+
return false;
|
670 |
+
|
671 |
+
m_detector->detect(current_img, m_nextKeypoints);
|
672 |
+
diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
|
673 |
+
index 0d61c9f..05c8b29 100644
|
674 |
+
--- a/src/third_party/CMakeLists.txt
|
675 |
+
+++ b/src/third_party/CMakeLists.txt
|
676 |
+
@@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
|
677 |
+
set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE)
|
678 |
+
|
679 |
+
# Add graph library
|
680 |
+
-if(DEFINED OpenMVG_USE_INTERNAL_LEMON)
|
681 |
+
+if(OpenMVG_USE_INTERNAL_LEMON)
|
682 |
+
add_subdirectory(lemon)
|
683 |
+
set(LEMON_LIBRARY openMVG_lemon PARENT_SCOPE)
|
684 |
+
endif()
|
685 |
+
@@ -67,7 +67,7 @@ endif (NOT TIFF_FOUND)
|
686 |
+
add_subdirectory(vectorGraphics)
|
687 |
+
|
688 |
+
# Add ceres-solver (A Nonlinear Least Squares Minimizer)
|
689 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_CERES)
|
690 |
+
+if (OpenMVG_USE_INTERNAL_CERES)
|
691 |
+
add_subdirectory(cxsparse)
|
692 |
+
add_subdirectory(ceres-solver)
|
693 |
+
set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres)
|
694 |
+
@@ -75,7 +75,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
|
695 |
+
endif()
|
696 |
+
|
697 |
+
# Add an Approximate Nearest Neighbor library
|
698 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
|
699 |
+
+if (OpenMVG_USE_INTERNAL_FLANN)
|
700 |
+
set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp)
|
701 |
+
add_subdirectory(flann)
|
702 |
+
endif()
|
703 |
+
@@ -89,7 +89,7 @@ add_subdirectory(fast)
|
704 |
+
##
|
705 |
+
# Install Header only libraries if necessary
|
706 |
+
##
|
707 |
+
-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
|
708 |
+
+if (OpenMVG_USE_INTERNAL_EIGEN)
|
709 |
+
#Configure Eigen install
|
710 |
+
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
|
711 |
+
add_subdirectory(eigen)
|
712 |
+
diff --git a/src/openMVG/cameras/CMakeLists.txt b/src/openMVG/cameras/CMakeLists.txt
|
713 |
+
index 333ab729..50c8f572 100644
|
714 |
+
--- a/src/openMVG/cameras/CMakeLists.txt
|
715 |
+
+++ b/src/openMVG/cameras/CMakeLists.txt
|
716 |
+
@@ -4,7 +4,7 @@ set_property(TARGET openMVG_camera APPEND PROPERTY
|
717 |
+
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:include>")
|
718 |
+
|
719 |
+
target_compile_features(openMVG_camera INTERFACE ${CXX11_FEATURES})
|
720 |
+
-target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal ${OPENMVG_LIBRARY_DEPENDENCIES})
|
721 |
+
+target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal::cereal ${OPENMVG_LIBRARY_DEPENDENCIES})
|
722 |
+
install(TARGETS openMVG_camera DESTINATION lib EXPORT openMVG-targets)
|
723 |
+
|
724 |
+
UNIT_TEST(openMVG Camera_Pinhole openMVG_camera)
|
725 |
+
diff --git a/src/openMVG/features/CMakeLists.txt b/src/openMVG/features/CMakeLists.txt
|
726 |
+
index 2e49701d..0b5e1c3d 100644
|
727 |
+
--- a/src/openMVG/features/CMakeLists.txt
|
728 |
+
+++ b/src/openMVG/features/CMakeLists.txt
|
729 |
+
@@ -31,7 +31,7 @@ target_include_directories(openMVG_features
|
730 |
+
)
|
731 |
+
target_link_libraries(openMVG_features
|
732 |
+
PRIVATE openMVG_fast ${STLPLUS_LIBRARY}
|
733 |
+
- PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal)
|
734 |
+
+ PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal::cereal)
|
735 |
+
if (MSVC)
|
736 |
+
set_target_properties(openMVG_features PROPERTIES COMPILE_FLAGS "/bigobj")
|
737 |
+
target_compile_options(openMVG_features PUBLIC "-D_USE_MATH_DEFINES")
|
738 |
+
diff --git a/src/openMVG/geometry/CMakeLists.txt b/src/openMVG/geometry/CMakeLists.txt
|
739 |
+
index 0a6a016a..e509a4d5 100644
|
740 |
+
--- a/src/openMVG/geometry/CMakeLists.txt
|
741 |
+
+++ b/src/openMVG/geometry/CMakeLists.txt
|
742 |
+
@@ -21,7 +21,7 @@ set_property(TARGET openMVG_geometry PROPERTY FOLDER OpenMVG/OpenMVG)
|
743 |
+
target_link_libraries(openMVG_geometry
|
744 |
+
PUBLIC
|
745 |
+
openMVG_numeric
|
746 |
+
- cereal
|
747 |
+
+ cereal::cereal
|
748 |
+
PRIVATE
|
749 |
+
openMVG_linearProgramming
|
750 |
+
)
|
751 |
+
diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt
|
752 |
+
index b8928083..1d10f939 100644
|
753 |
+
--- a/src/openMVG/sfm/CMakeLists.txt
|
754 |
+
+++ b/src/openMVG/sfm/CMakeLists.txt
|
755 |
+
@@ -25,7 +25,7 @@ target_link_libraries(openMVG_sfm
|
756 |
+
openMVG_graph
|
757 |
+
openMVG_matching
|
758 |
+
openMVG_multiview
|
759 |
+
- cereal
|
760 |
+
+ cereal::cereal
|
761 |
+
${OPENMVG_LIBRARY_DEPENDENCIES}
|
762 |
+
)
|
763 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/portfile.cmake
ADDED
@@ -0,0 +1,173 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_buildpath_length_warning(37)
|
2 |
+
|
3 |
+
#the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself
|
4 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
5 |
+
|
6 |
+
if("software" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL static)
|
7 |
+
message(FATAL_ERROR "OpenMVG software currently cannot be built with static CRT linking. Please open an issue if you require this feature.")
|
8 |
+
endif()
|
9 |
+
|
10 |
+
vcpkg_from_github(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
REPO openMVG/openMVG
|
13 |
+
REF d0fe73dd426ae4001631a51272cff71047522df9 # v2.0
|
14 |
+
SHA512 1d5c68971ad63ced46d8b9070bdacc1065b4ba950fe919e11f952a004def87d4d83a474d48aee714c21b12106d7d81187d3670d8a2e6daf2d3c5fceb008a5de3
|
15 |
+
PATCHES
|
16 |
+
build_fixes.patch
|
17 |
+
0001-eigen_3.4.0.patch
|
18 |
+
0002-eigen-3.4.patch
|
19 |
+
)
|
20 |
+
|
21 |
+
set(OpenMVG_USE_OPENMP OFF)
|
22 |
+
if("openmp" IN_LIST FEATURES)
|
23 |
+
set(OpenMVG_USE_OPENMP ON)
|
24 |
+
endif()
|
25 |
+
|
26 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
27 |
+
FEATURES
|
28 |
+
opencv OpenMVG_USE_OPENCV
|
29 |
+
opencv OpenMVG_USE_OCVSIFT
|
30 |
+
software OpenMVG_BUILD_SOFTWARES
|
31 |
+
software OpenMVG_BUILD_GUI_SOFTWARES
|
32 |
+
)
|
33 |
+
|
34 |
+
# remove some deps to prevent conflict
|
35 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver
|
36 |
+
${SOURCE_PATH}/src/third_party/cxsparse
|
37 |
+
${SOURCE_PATH}/src/third_party/eigen
|
38 |
+
${SOURCE_PATH}/src/third_party/flann
|
39 |
+
${SOURCE_PATH}/src/third_party/jpeg
|
40 |
+
${SOURCE_PATH}/src/third_party/lemon
|
41 |
+
${SOURCE_PATH}/src/third_party/png
|
42 |
+
${SOURCE_PATH}/src/third_party/tiff
|
43 |
+
${SOURCE_PATH}/src/third_party/zlib)
|
44 |
+
|
45 |
+
# remove some cmake modules to force using our configs
|
46 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake
|
47 |
+
${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake
|
48 |
+
${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake
|
49 |
+
${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake
|
50 |
+
${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake
|
51 |
+
${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake)
|
52 |
+
|
53 |
+
vcpkg_cmake_configure(
|
54 |
+
SOURCE_PATH "${SOURCE_PATH}/src"
|
55 |
+
OPTIONS ${FEATURE_OPTIONS}
|
56 |
+
-DOpenMVG_USE_OPENMP=${OpenMVG_USE_OPENMP}
|
57 |
+
-DOpenMVG_BUILD_SHARED=OFF
|
58 |
+
-DOpenMVG_BUILD_TESTS=OFF
|
59 |
+
-DOpenMVG_BUILD_DOC=OFF
|
60 |
+
-DOpenMVG_BUILD_EXAMPLES=OFF
|
61 |
+
-DOpenMVG_BUILD_OPENGL_EXAMPLES=OFF
|
62 |
+
-DOpenMVG_BUILD_COVERAGE=OFF
|
63 |
+
-DOpenMVG_USE_INTERNAL_CLP=OFF
|
64 |
+
-DOpenMVG_USE_INTERNAL_COINUTILS=OFF
|
65 |
+
-DOpenMVG_USE_INTERNAL_OSI=OFF
|
66 |
+
-DOpenMVG_USE_INTERNAL_EIGEN=OFF
|
67 |
+
-DOpenMVG_USE_INTERNAL_CEREAL=OFF
|
68 |
+
-DOpenMVG_USE_INTERNAL_CERES=OFF
|
69 |
+
-DOpenMVG_USE_INTERNAL_FLANN=OFF
|
70 |
+
-DOpenMVG_USE_INTERNAL_LEMON=OFF
|
71 |
+
)
|
72 |
+
|
73 |
+
vcpkg_cmake_install()
|
74 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/openMVG/cmake)
|
75 |
+
|
76 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
77 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
78 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG-targets-debug.cmake")
|
79 |
+
endif()
|
80 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets.cmake" "${CURRENT_PACKAGES_DIR}/lib/openMVG-targets-release.cmake")
|
81 |
+
|
82 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test"
|
83 |
+
"${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data"
|
84 |
+
"${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl")
|
85 |
+
|
86 |
+
if(OpenMVG_BUILD_SHARED)
|
87 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
88 |
+
# release
|
89 |
+
file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.dll")
|
90 |
+
file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
91 |
+
file(REMOVE_RECURSE "${DLL_FILES}")
|
92 |
+
endif()
|
93 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
94 |
+
# debug
|
95 |
+
file(GLOB DLL_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
|
96 |
+
file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
97 |
+
file(REMOVE_RECURSE "${DLL_FILES}")
|
98 |
+
endif()
|
99 |
+
endif()
|
100 |
+
vcpkg_copy_pdbs()
|
101 |
+
|
102 |
+
if("software" IN_LIST FEATURES)
|
103 |
+
if(VCPKG_TARGET_IS_OSX)
|
104 |
+
vcpkg_copy_tools(TOOL_NAMES
|
105 |
+
openMVG_main_AlternativeVO.app
|
106 |
+
ui_openMVG_MatchesViewer.app
|
107 |
+
)
|
108 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app")
|
109 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app")
|
110 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app")
|
111 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app")
|
112 |
+
else()
|
113 |
+
vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
|
114 |
+
openMVG_main_AlternativeVO
|
115 |
+
ui_openMVG_MatchesViewer
|
116 |
+
)
|
117 |
+
endif()
|
118 |
+
vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
|
119 |
+
openMVG_main_ChangeLocalOrigin
|
120 |
+
openMVG_main_ColHarmonize
|
121 |
+
openMVG_main_ComputeClusters
|
122 |
+
openMVG_main_ComputeFeatures
|
123 |
+
openMVG_main_ComputeMatches
|
124 |
+
openMVG_main_ComputeSfM_DataColor
|
125 |
+
openMVG_main_ComputeStructureFromKnownPoses
|
126 |
+
openMVG_main_ConvertList
|
127 |
+
openMVG_main_ConvertSfM_DataFormat
|
128 |
+
openMVG_main_evalQuality
|
129 |
+
openMVG_main_ExportCameraFrustums
|
130 |
+
openMVG_main_exportKeypoints
|
131 |
+
openMVG_main_exportMatches
|
132 |
+
openMVG_main_exportTracks
|
133 |
+
openMVG_main_ExportUndistortedImages
|
134 |
+
openMVG_main_FrustumFiltering
|
135 |
+
openMVG_main_geodesy_registration_to_gps_position
|
136 |
+
openMVG_main_ListMatchingPairs
|
137 |
+
openMVG_main_MatchesToTracks
|
138 |
+
openMVG_main_openMVG2Agisoft
|
139 |
+
openMVG_main_openMVG2CMPMVS
|
140 |
+
openMVG_main_openMVG2Colmap
|
141 |
+
openMVG_main_openMVG2MESHLAB
|
142 |
+
openMVG_main_openMVG2MVE2
|
143 |
+
openMVG_main_openMVG2MVSTEXTURING
|
144 |
+
openMVG_main_openMVG2NVM
|
145 |
+
openMVG_main_openMVG2openMVS
|
146 |
+
openMVG_main_openMVG2PMVS
|
147 |
+
openMVG_main_openMVG2WebGL
|
148 |
+
openMVG_main_openMVGSpherical2Cubic
|
149 |
+
openMVG_main_PointsFiltering
|
150 |
+
openMVG_main_SfMInit_ImageListing
|
151 |
+
openMVG_main_SfMInit_ImageListingFromKnownPoses
|
152 |
+
openMVG_main_SfM_Localization
|
153 |
+
openMVG_main_SplitMatchFileIntoMatchFiles
|
154 |
+
ui_openMVG_control_points_registration
|
155 |
+
openMVG_main_GeometricFilter
|
156 |
+
openMVG_main_PairGenerator
|
157 |
+
openMVG_main_SfM
|
158 |
+
)
|
159 |
+
if("opencv" IN_LIST FEATURES)
|
160 |
+
vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
|
161 |
+
openMVG_main_ComputeFeatures_OpenCV)
|
162 |
+
endif()
|
163 |
+
|
164 |
+
file(COPY "${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
165 |
+
set(OPENMVG_SOFTWARE_SFM_BUILD_DIR "${CURRENT_INSTALLED_DIR}/tools/${PORT}")
|
166 |
+
set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY "${CURRENT_INSTALLED_DIR}/tools/${PORT}")
|
167 |
+
configure_file("${SOURCE_PATH}/src/software/SfM/tutorial_demo.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/tutorial_demo.py" @ONLY)
|
168 |
+
configure_file("${SOURCE_PATH}/src/software/SfM/SfM_GlobalPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_GlobalPipeline.py" @ONLY)
|
169 |
+
configure_file("${SOURCE_PATH}/src/software/SfM/SfM_SequentialPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_SequentialPipeline.py" @ONLY)
|
170 |
+
endif()
|
171 |
+
|
172 |
+
# Handle copyright
|
173 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvg/vcpkg.json
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openmvg",
|
3 |
+
"version": "2.0",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
|
6 |
+
"license": "MPL-2.0-no-copyleft-exception",
|
7 |
+
"dependencies": [
|
8 |
+
"cereal",
|
9 |
+
{
|
10 |
+
"name": "ceres",
|
11 |
+
"features": [
|
12 |
+
"cxsparse",
|
13 |
+
"suitesparse"
|
14 |
+
]
|
15 |
+
},
|
16 |
+
"clp",
|
17 |
+
"coinutils",
|
18 |
+
"eigen3",
|
19 |
+
"flann",
|
20 |
+
"libjpeg-turbo",
|
21 |
+
"liblemon",
|
22 |
+
"libpng",
|
23 |
+
"osi",
|
24 |
+
"tiff",
|
25 |
+
{
|
26 |
+
"name": "vcpkg-cmake",
|
27 |
+
"host": true
|
28 |
+
},
|
29 |
+
{
|
30 |
+
"name": "vcpkg-cmake-config",
|
31 |
+
"host": true
|
32 |
+
},
|
33 |
+
"vlfeat",
|
34 |
+
"zlib"
|
35 |
+
],
|
36 |
+
"features": {
|
37 |
+
"opencv": {
|
38 |
+
"description": "opencv support for openmvg",
|
39 |
+
"dependencies": [
|
40 |
+
{
|
41 |
+
"name": "opencv",
|
42 |
+
"features": [
|
43 |
+
"contrib"
|
44 |
+
]
|
45 |
+
}
|
46 |
+
]
|
47 |
+
},
|
48 |
+
"openmp": {
|
49 |
+
"description": "openmp support for openmvg"
|
50 |
+
},
|
51 |
+
"software": {
|
52 |
+
"description": "build openMVG tools",
|
53 |
+
"dependencies": [
|
54 |
+
"qt5-base",
|
55 |
+
"qt5-svg"
|
56 |
+
]
|
57 |
+
}
|
58 |
+
}
|
59 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/fix-build-boost-1_77_0.patch
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
libs/Common/Common.cpp | 5 +++++
|
2 |
+
1 file changed, 5 insertions(+)
|
3 |
+
|
4 |
+
diff --git a/libs/Common/Common.cpp b/libs/Common/Common.cpp
|
5 |
+
index 052951d..8dc404e 100644
|
6 |
+
--- a/libs/Common/Common.cpp
|
7 |
+
+++ b/libs/Common/Common.cpp
|
8 |
+
@@ -31,6 +31,11 @@ namespace boost {
|
9 |
+
ASSERT("boost exception thrown" == NULL);
|
10 |
+
exit(EXIT_FAILURE);
|
11 |
+
}
|
12 |
+
+ void throw_exception(std::exception const & e, boost::source_location const &) {
|
13 |
+
+ VERBOSE("exception thrown: %s", e.what());
|
14 |
+
+ ASSERT("boost exception thrown" == NULL);
|
15 |
+
+ exit(EXIT_FAILURE);
|
16 |
+
+ }
|
17 |
+
} // namespace boost
|
18 |
+
#endif
|
19 |
+
#endif
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/fix-build.patch
ADDED
@@ -0,0 +1,449 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 7966ed5..f34b5b4 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -63,9 +63,10 @@ INCLUDE_DIRECTORIES("${OpenMVS_SOURCE_DIR}")
|
6 |
+
SET(OpenMVS_EXTRA_LIBS "")
|
7 |
+
if(OpenMVS_USE_OPENMP)
|
8 |
+
SET(OpenMP_LIBS "")
|
9 |
+
- FIND_PACKAGE(OpenMP)
|
10 |
+
- if(OPENMP_FOUND)
|
11 |
+
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
12 |
+
+ FIND_PACKAGE(OpenMP REQUIRED)
|
13 |
+
+ if(OpenMP_FOUND)
|
14 |
+
+ link_libraries(OpenMP::OpenMP_CXX)
|
15 |
+
+ link_libraries(OpenMP::OpenMP_C)
|
16 |
+
ADD_DEFINITIONS(-D_USE_OPENMP)
|
17 |
+
SET(_USE_OPENMP TRUE)
|
18 |
+
#cmake only check for separate OpenMP library on AppleClang 7+
|
19 |
+
@@ -83,7 +84,7 @@ if(OpenMVS_USE_OPENGL)
|
20 |
+
if(POLICY CMP0072)
|
21 |
+
cmake_policy(SET CMP0072 NEW)
|
22 |
+
endif()
|
23 |
+
- FIND_PACKAGE(OpenGL)
|
24 |
+
+ FIND_PACKAGE(OpenGL REQUIRED)
|
25 |
+
if(OPENGL_FOUND)
|
26 |
+
INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
|
27 |
+
ADD_DEFINITIONS(${OpenGL_DEFINITIONS} -D_USE_OPENGL)
|
28 |
+
@@ -94,7 +95,7 @@ if(OpenMVS_USE_OPENGL)
|
29 |
+
endif()
|
30 |
+
|
31 |
+
if(OpenMVS_USE_CUDA)
|
32 |
+
- FIND_PACKAGE(CUDA)
|
33 |
+
+ FIND_PACKAGE(CUDA REQUIRED)
|
34 |
+
if(CUDA_FOUND)
|
35 |
+
INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
|
36 |
+
ADD_DEFINITIONS(-D_USE_CUDA)
|
37 |
+
@@ -108,7 +109,7 @@ else()
|
38 |
+
endif()
|
39 |
+
|
40 |
+
if(OpenMVS_USE_BREAKPAD)
|
41 |
+
- FIND_PACKAGE(BREAKPAD)
|
42 |
+
+ FIND_PACKAGE(BREAKPAD REQUIRED)
|
43 |
+
if(BREAKPAD_FOUND)
|
44 |
+
INCLUDE_DIRECTORIES(${BREAKPAD_INCLUDE_DIRS})
|
45 |
+
ADD_DEFINITIONS(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD)
|
46 |
+
@@ -119,7 +120,7 @@ if(OpenMVS_USE_BREAKPAD)
|
47 |
+
endif()
|
48 |
+
endif()
|
49 |
+
|
50 |
+
-FIND_PACKAGE(Boost ${SYSTEM_PACKAGE_REQUIRED} COMPONENTS iostreams program_options system serialization)
|
51 |
+
+FIND_PACKAGE(Boost COMPONENTS iostreams program_options system serialization REQUIRED)
|
52 |
+
if(Boost_FOUND)
|
53 |
+
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
|
54 |
+
ADD_DEFINITIONS(${Boost_DEFINITIONS} -D_USE_BOOST)
|
55 |
+
@@ -127,14 +128,14 @@ if(Boost_FOUND)
|
56 |
+
SET(_USE_BOOST TRUE)
|
57 |
+
endif()
|
58 |
+
|
59 |
+
-FIND_PACKAGE(Eigen ${SYSTEM_PACKAGE_REQUIRED})
|
60 |
+
-if(EIGEN_FOUND)
|
61 |
+
- INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS})
|
62 |
+
- ADD_DEFINITIONS(${EIGEN_DEFINITIONS} -D_USE_EIGEN)
|
63 |
+
+FIND_PACKAGE(Eigen3 REQUIRED)
|
64 |
+
+if(EIGEN3_FOUND)
|
65 |
+
+ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
|
66 |
+
+ ADD_DEFINITIONS(${EIGEN3_DEFINITIONS} -D_USE_EIGEN)
|
67 |
+
SET(_USE_EIGEN TRUE)
|
68 |
+
endif()
|
69 |
+
|
70 |
+
-FIND_PACKAGE(OpenCV ${SYSTEM_PACKAGE_REQUIRED})
|
71 |
+
+FIND_PACKAGE(OpenCV REQUIRED)
|
72 |
+
if(OpenCV_FOUND)
|
73 |
+
INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
|
74 |
+
ADD_DEFINITIONS(${OpenCV_DEFINITIONS})
|
75 |
+
@@ -170,7 +171,9 @@ ADD_DEFINITIONS(${OpenMVS_DEFINITIONS})
|
76 |
+
|
77 |
+
# Add modules
|
78 |
+
ADD_SUBDIRECTORY(libs)
|
79 |
+
+if(OpenMVS_BUILD_TOOLS)
|
80 |
+
ADD_SUBDIRECTORY(apps)
|
81 |
+
+endif()
|
82 |
+
ADD_SUBDIRECTORY(docs)
|
83 |
+
|
84 |
+
if(OpenMVS_USE_CERES)
|
85 |
+
@@ -188,7 +191,7 @@ export(TARGETS Common IO Math MVS FILE "${PROJECT_BINARY_DIR}/OpenMVSTargets.cma
|
86 |
+
# Export the package for use from the build-tree
|
87 |
+
# (this registers the build-tree with a global CMake-registry)
|
88 |
+
export(PACKAGE OpenMVS)
|
89 |
+
-
|
90 |
+
+
|
91 |
+
# Create the OpenMVSConfig.cmake and OpenMVSConfigVersion files
|
92 |
+
file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
|
93 |
+
# ... for the build tree
|
94 |
+
@@ -199,7 +202,7 @@ set(CONF_INCLUDE_DIRS "${INSTALL_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
95 |
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfig.cmake.in" "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake" @ONLY)
|
96 |
+
# ... for both
|
97 |
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfigVersion.cmake.in" "${PROJECT_BINARY_DIR}/OpenMVSConfigVersion.cmake" @ONLY)
|
98 |
+
-
|
99 |
+
+
|
100 |
+
# Install the OpenMVSConfig.cmake and OpenMVSConfigVersion.cmake
|
101 |
+
install(FILES
|
102 |
+
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake"
|
103 |
+
diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in
|
104 |
+
similarity index 97%
|
105 |
+
rename from MvgMvsPipeline.py
|
106 |
+
rename to MvgMvsPipeline.py.in
|
107 |
+
index f4914bf..23d03e6 100644
|
108 |
+
--- a/MvgMvsPipeline.py
|
109 |
+
+++ b/MvgMvsPipeline.py.in
|
110 |
+
@@ -91,12 +91,12 @@ def find(afile):
|
111 |
+
|
112 |
+
|
113 |
+
# Try to find openMVG and openMVS binaries in PATH
|
114 |
+
-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing")
|
115 |
+
-OPENMVS_BIN = whereis("ReconstructMesh")
|
116 |
+
+OPENMVG_BIN = "@OPENMVG_TOOLS_PATH@"
|
117 |
+
+OPENMVS_BIN = "@OPENMVS_TOOLS_PATH@"
|
118 |
+
|
119 |
+
# Try to find openMVG camera sensor database
|
120 |
+
-CAMERA_SENSOR_DB_FILE = "sensor_width_camera_database.txt"
|
121 |
+
-CAMERA_SENSOR_DB_DIRECTORY = find(CAMERA_SENSOR_DB_FILE)
|
122 |
+
+CAMERA_SENSOR_DB_FILE = "@SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH@"
|
123 |
+
+CAMERA_SENSOR_DB_DIRECTORY = "@OPENMVG_TOOLS_PATH@"
|
124 |
+
|
125 |
+
# Ask user for openMVG and openMVS directories if not found
|
126 |
+
if not OPENMVG_BIN:
|
127 |
+
@@ -175,10 +175,10 @@ class StepsStore:
|
128 |
+
["-i", "%input_dir%", "-o", "%matches_dir%", "-d", "%camera_file_params%"]],
|
129 |
+
["Compute features", # 1
|
130 |
+
os.path.join(OPENMVG_BIN, "openMVG_main_ComputeFeatures"),
|
131 |
+
- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT", "-n", "4"]],
|
132 |
+
+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT"]],
|
133 |
+
["Compute matches", # 2
|
134 |
+
os.path.join(OPENMVG_BIN, "openMVG_main_ComputeMatches"),
|
135 |
+
- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "HNSWL2", "-r", ".8"]],
|
136 |
+
+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "AUTO", "-r", ".8"]],
|
137 |
+
["Incremental reconstruction", # 3
|
138 |
+
os.path.join(OPENMVG_BIN, "openMVG_main_IncrementalSfM"),
|
139 |
+
["-i", "%matches_dir%/sfm_data.json", "-m", "%matches_dir%", "-o", "%reconstruction_dir%"]],
|
140 |
+
diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt
|
141 |
+
index c519040..934cd50 100644
|
142 |
+
--- a/apps/Viewer/CMakeLists.txt
|
143 |
+
+++ b/apps/Viewer/CMakeLists.txt
|
144 |
+
@@ -16,18 +16,6 @@ else()
|
145 |
+
MESSAGE("-- Can't find GLEW. Continuing without it.")
|
146 |
+
RETURN()
|
147 |
+
endif()
|
148 |
+
-if(CMAKE_COMPILER_IS_GNUCXX)
|
149 |
+
- FIND_PACKAGE(PkgConfig QUIET)
|
150 |
+
- pkg_search_module(GLFW QUIET glfw3)
|
151 |
+
- if(GLFW_FOUND)
|
152 |
+
- INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
|
153 |
+
- ADD_DEFINITIONS(${GLFW_DEFINITIONS})
|
154 |
+
- MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})")
|
155 |
+
- else()
|
156 |
+
- MESSAGE("-- Can't find GLFW3. Continuing without it.")
|
157 |
+
- RETURN()
|
158 |
+
- endif()
|
159 |
+
-else()
|
160 |
+
FIND_PACKAGE(glfw3 QUIET)
|
161 |
+
if(glfw3_FOUND)
|
162 |
+
INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS})
|
163 |
+
@@ -37,7 +25,6 @@ else()
|
164 |
+
MESSAGE("-- Can't find GLFW3. Continuing without it.")
|
165 |
+
RETURN()
|
166 |
+
endif()
|
167 |
+
-endif()
|
168 |
+
|
169 |
+
# List sources files
|
170 |
+
FILE(GLOB PCH_C "Common.cpp")
|
171 |
+
diff --git a/build/OpenMVSConfig.cmake.in b/build/OpenMVSConfig.cmake.in
|
172 |
+
index 96b8fe2..fa6d4a6 100644
|
173 |
+
--- a/build/OpenMVSConfig.cmake.in
|
174 |
+
+++ b/build/OpenMVSConfig.cmake.in
|
175 |
+
@@ -3,16 +3,71 @@
|
176 |
+
# OpenMVS_INCLUDE_DIRS - include directories for OpenMVS
|
177 |
+
# OpenMVS_LIBRARIES - libraries to link against
|
178 |
+
# OpenMVS_BINARIES - the binaries
|
179 |
+
-
|
180 |
+
+
|
181 |
+
# Compute paths
|
182 |
+
get_filename_component(OpenMVS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
183 |
+
set(OpenMVS_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
|
184 |
+
-
|
185 |
+
+list(APPEND CMAKE_MODULE_PATH "${OpenMVS_CMAKE_DIR}")
|
186 |
+
+
|
187 |
+
+if (MSVC)
|
188 |
+
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL")
|
189 |
+
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
|
190 |
+
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
|
191 |
+
+ set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
|
192 |
+
+endif()
|
193 |
+
+
|
194 |
+
+set(CMAKE_CXX_STANDARD 14)
|
195 |
+
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
196 |
+
+
|
197 |
+
+include(CMakeFindDependencyMacro)
|
198 |
+
+
|
199 |
+
+if(@OpenMVS_USE_OPENMP@)
|
200 |
+
+ find_dependency(OpenMP)
|
201 |
+
+ add_definitions(-D_USE_OPENMP)
|
202 |
+
+endif()
|
203 |
+
+
|
204 |
+
+if(@OpenMVS_USE_OPENGL@)
|
205 |
+
+ find_dependency(OpenGL)
|
206 |
+
+ add_definitions(${OpenGL_DEFINITIONS} -D_USE_OPENGL)
|
207 |
+
+endif()
|
208 |
+
+
|
209 |
+
+if(@OpenMVS_USE_CUDA@)
|
210 |
+
+ find_dependency(CUDA)
|
211 |
+
+ add_definitions(-D_USE_CUDA)
|
212 |
+
+ include_directories(${CUDA_INCLUDE_DIRS})
|
213 |
+
+endif()
|
214 |
+
+
|
215 |
+
+if(@OpenMVS_USE_BREAKPAD@)
|
216 |
+
+ find_dependency(BREAKPAD)
|
217 |
+
+ add_definitions(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD)
|
218 |
+
+endif()
|
219 |
+
+
|
220 |
+
+find_dependency(Boost)
|
221 |
+
+add_definitions(${Boost_DEFINITIONS} -D_USE_BOOST)
|
222 |
+
+include_directories(${Boost_INCLUDE_DIRS})
|
223 |
+
+find_dependency(Eigen3)
|
224 |
+
+add_definitions(${EIGEN3_DEFINITIONS} -D_USE_EIGEN)
|
225 |
+
+include_directories(${EIGEN3_INCLUDE_DIRS})
|
226 |
+
+find_dependency(OpenCV)
|
227 |
+
+add_definitions(${OpenCV_DEFINITIONS})
|
228 |
+
+find_dependency(CGAL)
|
229 |
+
+add_definitions(${CGAL_DEFINITIONS})
|
230 |
+
+
|
231 |
+
+find_dependency(VCG REQUIRED)
|
232 |
+
+add_definitions(${VCG_DEFINITIONS})
|
233 |
+
+
|
234 |
+
+if(@OpenMVS_USE_CERES@)
|
235 |
+
+ find_dependency(Ceres)
|
236 |
+
+ add_definitions(${CERES_DEFINITIONS})
|
237 |
+
+endif()
|
238 |
+
+
|
239 |
+
+add_definitions(@OpenMVS_DEFINITIONS@)
|
240 |
+
+
|
241 |
+
# Our library dependencies (contains definitions for IMPORTED targets)
|
242 |
+
if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR)
|
243 |
+
include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake")
|
244 |
+
endif()
|
245 |
+
-
|
246 |
+
+
|
247 |
+
# These are IMPORTED targets created by OpenMVSTargets.cmake
|
248 |
+
set(OpenMVS_LIBRARIES MVS)
|
249 |
+
set(OpenMVS_BINARIES InterfaceVisualSFM DensifyPointCloud ReconstructMesh RefineMesh TextureMesh)
|
250 |
+
diff --git a/build/Utils.cmake b/build/Utils.cmake
|
251 |
+
index f41c9d8..31cd292 100644
|
252 |
+
--- a/build/Utils.cmake
|
253 |
+
+++ b/build/Utils.cmake
|
254 |
+
@@ -160,7 +160,7 @@ macro(GetOperatingSystemArchitectureBitness)
|
255 |
+
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686.*|i386.*|x86.*)
|
256 |
+
set(X86 1)
|
257 |
+
endif()
|
258 |
+
-
|
259 |
+
+
|
260 |
+
if(NOT ${MY_VAR_PREFIX}_PACKAGE_REQUIRED)
|
261 |
+
set(${MY_VAR_PREFIX}_PACKAGE_REQUIRED "REQUIRED")
|
262 |
+
endif()
|
263 |
+
@@ -173,30 +173,6 @@ macro(ComposePackageLibSuffix)
|
264 |
+
set(PACKAGE_LIB_SUFFIX "")
|
265 |
+
set(PACKAGE_LIB_SUFFIX_DBG "")
|
266 |
+
set(PACKAGE_LIB_SUFFIX_REL "")
|
267 |
+
- if(MSVC)
|
268 |
+
- if("${MSVC_VERSION}" STREQUAL "1921")
|
269 |
+
- set(PACKAGE_LIB_SUFFIX "/vc16")
|
270 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1916")
|
271 |
+
- set(PACKAGE_LIB_SUFFIX "/vc15")
|
272 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1900")
|
273 |
+
- set(PACKAGE_LIB_SUFFIX "/vc14")
|
274 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1800")
|
275 |
+
- set(PACKAGE_LIB_SUFFIX "/vc12")
|
276 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1700")
|
277 |
+
- set(PACKAGE_LIB_SUFFIX "/vc11")
|
278 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1600")
|
279 |
+
- set(PACKAGE_LIB_SUFFIX "/vc10")
|
280 |
+
- elseif("${MSVC_VERSION}" STREQUAL "1500")
|
281 |
+
- set(PACKAGE_LIB_SUFFIX "/vc9")
|
282 |
+
- endif()
|
283 |
+
- if("${SYSTEM_BITNESS}" STREQUAL "64")
|
284 |
+
- set(PACKAGE_LIB_SUFFIX "${PACKAGE_LIB_SUFFIX}/x64")
|
285 |
+
- else()
|
286 |
+
- set(PACKAGE_LIB_SUFFIX "${PACKAGE_LIB_SUFFIX}/x86")
|
287 |
+
- endif()
|
288 |
+
- set(PACKAGE_LIB_SUFFIX_DBG "${PACKAGE_LIB_SUFFIX}/Debug")
|
289 |
+
- set(PACKAGE_LIB_SUFFIX_REL "${PACKAGE_LIB_SUFFIX}/Release")
|
290 |
+
- endif()
|
291 |
+
endmacro()
|
292 |
+
|
293 |
+
|
294 |
+
@@ -511,7 +487,7 @@ macro(optimize_default_compiler_settings)
|
295 |
+
endif()
|
296 |
+
add_extra_compiler_option(-fdiagnostics-show-option)
|
297 |
+
add_extra_compiler_option(-ftemplate-backtrace-limit=0)
|
298 |
+
-
|
299 |
+
+
|
300 |
+
# The -Wno-long-long is required in 64bit systems when including sytem headers.
|
301 |
+
if(X86_64)
|
302 |
+
add_extra_compiler_option(-Wno-long-long)
|
303 |
+
@@ -817,7 +793,7 @@ macro(ConfigCompilerAndLinker)
|
304 |
+
else()
|
305 |
+
set(cxx_rtti_support "${cxx_no_rtti_flags}")
|
306 |
+
endif()
|
307 |
+
-
|
308 |
+
+
|
309 |
+
SET(cxx_default "${cxx_exception_support} ${cxx_rtti_support}" CACHE PATH "Common compile CXX flags")
|
310 |
+
SET(c_default "${CMAKE_C_FLAGS} ${cxx_base_flags}" CACHE PATH "Common compile C flags")
|
311 |
+
endmacro()
|
312 |
+
@@ -825,16 +801,12 @@ endmacro()
|
313 |
+
# Initialize variables needed for a library type project.
|
314 |
+
macro(ConfigLibrary)
|
315 |
+
# Offer the user the choice of overriding the installation directories
|
316 |
+
- set(INSTALL_LIB_DIR "lib/${PROJECT_NAME}" CACHE PATH "Installation directory for libraries")
|
317 |
+
- set(INSTALL_BIN_DIR "bin/${PROJECT_NAME}" CACHE PATH "Installation directory for executables")
|
318 |
+
- set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Installation directory for header files")
|
319 |
+
- if(WIN32 AND NOT CYGWIN)
|
320 |
+
- set(DEF_INSTALL_CMAKE_DIR "CMake")
|
321 |
+
- else()
|
322 |
+
- set(DEF_INSTALL_CMAKE_DIR "lib/CMake/${PROJECT_NAME}")
|
323 |
+
- endif()
|
324 |
+
+ set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries")
|
325 |
+
+ set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables")
|
326 |
+
+ set(INSTALL_INCLUDE_DIR "include/openmvs" CACHE PATH "Installation directory for header files")
|
327 |
+
+ set(DEF_INSTALL_CMAKE_DIR "share/openmvs")
|
328 |
+
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
|
329 |
+
-
|
330 |
+
+
|
331 |
+
# Make relative paths absolute (needed later on)
|
332 |
+
foreach(p LIB BIN INCLUDE CMAKE)
|
333 |
+
set(var INSTALL_${p}_DIR)
|
334 |
+
diff --git a/libs/Common/CMakeLists.txt b/libs/Common/CMakeLists.txt
|
335 |
+
index 2e6c1a4..6e1fa95 100644
|
336 |
+
--- a/libs/Common/CMakeLists.txt
|
337 |
+
+++ b/libs/Common/CMakeLists.txt
|
338 |
+
@@ -18,6 +18,7 @@ set_target_pch(Common Common.h)
|
339 |
+
|
340 |
+
# Link its dependencies
|
341 |
+
TARGET_LINK_LIBRARIES(Common ${Boost_LIBRARIES} ${OpenCV_LIBS})
|
342 |
+
+TARGET_INCLUDE_DIRECTORIES(Common PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>)
|
343 |
+
|
344 |
+
# Install
|
345 |
+
SET_TARGET_PROPERTIES(Common PROPERTIES
|
346 |
+
diff --git a/libs/Common/Strings.h b/libs/Common/MVSStrings.h
|
347 |
+
similarity index 100%
|
348 |
+
rename from libs/Common/Strings.h
|
349 |
+
rename to libs/Common/MVSStrings.h
|
350 |
+
diff --git a/libs/Common/Types.h b/libs/Common/Types.h
|
351 |
+
index bcac65c..9abeefb 100644
|
352 |
+
--- a/libs/Common/Types.h
|
353 |
+
+++ b/libs/Common/Types.h
|
354 |
+
@@ -378,7 +378,7 @@ typedef TAliasCast<double,int32_t> CastD2I;
|
355 |
+
|
356 |
+
// I N C L U D E S /////////////////////////////////////////////////
|
357 |
+
|
358 |
+
-#include "Strings.h"
|
359 |
+
+#include "MVSStrings.h"
|
360 |
+
#include "AutoPtr.h"
|
361 |
+
#include "List.h"
|
362 |
+
#include "Thread.h"
|
363 |
+
@@ -2558,7 +2558,7 @@ public:
|
364 |
+
|
365 |
+
/// creates an SO3 as a rotation that takes Vector a into the direction of Vector b
|
366 |
+
/// with the rotation axis along a ^ b. If |a ^ b| == 0, it creates the identity rotation.
|
367 |
+
- /// An assertion will fail if Vector a and Vector b are in exactly opposite directions.
|
368 |
+
+ /// An assertion will fail if Vector a and Vector b are in exactly opposite directions.
|
369 |
+
/// @param a source Vector
|
370 |
+
/// @param b target Vector
|
371 |
+
SO3(const Vec3& a, const Vec3& b) {
|
372 |
+
@@ -2604,7 +2604,7 @@ public:
|
373 |
+
mat.row(2) -= mat.row(1) * d12;
|
374 |
+
mat.row(2).normalize();
|
375 |
+
// check for positive determinant <=> right handed coordinate system of row vectors
|
376 |
+
- ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0);
|
377 |
+
+ ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0);
|
378 |
+
}
|
379 |
+
|
380 |
+
/// Exponentiate a vector in the Lie algebra to generate a new SO3.
|
381 |
+
diff --git a/libs/IO/CMakeLists.txt b/libs/IO/CMakeLists.txt
|
382 |
+
index a354376..4fd478c 100644
|
383 |
+
--- a/libs/IO/CMakeLists.txt
|
384 |
+
+++ b/libs/IO/CMakeLists.txt
|
385 |
+
@@ -43,7 +43,8 @@ cxx_library_with_type_no_pch(IO "Libs" "STATIC" "${cxx_default}"
|
386 |
+
set_target_pch(IO Common.h)
|
387 |
+
|
388 |
+
# Link its dependencies
|
389 |
+
-TARGET_LINK_LIBRARIES(IO Common ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${EXIV2_LIBS})
|
390 |
+
+TARGET_LINK_LIBRARIES(IO Common ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${EXIV2_LIBS})
|
391 |
+
+TARGET_INCLUDE_DIRECTORIES(IO PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>)
|
392 |
+
|
393 |
+
# Install
|
394 |
+
SET_TARGET_PROPERTIES(IO PROPERTIES
|
395 |
+
diff --git a/libs/MVS/CMakeLists.txt b/libs/MVS/CMakeLists.txt
|
396 |
+
index 14be620..867cfd5 100644
|
397 |
+
--- a/libs/MVS/CMakeLists.txt
|
398 |
+
+++ b/libs/MVS/CMakeLists.txt
|
399 |
+
@@ -1,12 +1,12 @@
|
400 |
+
# Find required packages
|
401 |
+
-FIND_PACKAGE(CGAL ${SYSTEM_PACKAGE_REQUIRED})
|
402 |
+
+FIND_PACKAGE(CGAL REQUIRED)
|
403 |
+
if(CGAL_FOUND)
|
404 |
+
include_directories(${CGAL_INCLUDE_DIRS})
|
405 |
+
add_definitions(${CGAL_DEFINITIONS})
|
406 |
+
link_directories(${CGAL_LIBRARY_DIRS})
|
407 |
+
endif()
|
408 |
+
|
409 |
+
-FIND_PACKAGE(VCG ${SYSTEM_PACKAGE_REQUIRED})
|
410 |
+
+FIND_PACKAGE(VCG REQUIRED)
|
411 |
+
if(VCG_FOUND)
|
412 |
+
include_directories(${VCG_INCLUDE_DIRS})
|
413 |
+
add_definitions(${VCG_DEFINITIONS})
|
414 |
+
@@ -14,12 +14,10 @@ endif()
|
415 |
+
|
416 |
+
set(CERES_LIBS "")
|
417 |
+
if(OpenMVS_USE_CERES)
|
418 |
+
- FIND_PACKAGE(CERES)
|
419 |
+
+ FIND_PACKAGE(Ceres REQUIRED)
|
420 |
+
if(CERES_FOUND)
|
421 |
+
include_directories(${CERES_INCLUDE_DIRS})
|
422 |
+
add_definitions(${CERES_DEFINITIONS})
|
423 |
+
- else()
|
424 |
+
- set(OpenMVS_USE_CERES OFF)
|
425 |
+
endif()
|
426 |
+
endif()
|
427 |
+
|
428 |
+
@@ -42,7 +40,8 @@ cxx_library_with_type_no_pch(MVS "Libs" "" "${cxx_default}"
|
429 |
+
set_target_pch(MVS Common.h)
|
430 |
+
|
431 |
+
# Link its dependencies
|
432 |
+
-TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} ${CGAL_LIBS} ${CUDA_CUDA_LIBRARY})
|
433 |
+
+TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} CGAL::CGAL ${CUDA_CUDA_LIBRARY})
|
434 |
+
+TARGET_INCLUDE_DIRECTORIES(MVS PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>)
|
435 |
+
|
436 |
+
# Install
|
437 |
+
SET_TARGET_PROPERTIES(MVS PROPERTIES
|
438 |
+
diff --git a/libs/Math/CMakeLists.txt b/libs/Math/CMakeLists.txt
|
439 |
+
index d592bd0..f1fe4c6 100644
|
440 |
+
--- a/libs/Math/CMakeLists.txt
|
441 |
+
+++ b/libs/Math/CMakeLists.txt
|
442 |
+
@@ -35,6 +35,7 @@ set_target_pch(Math Common.h)
|
443 |
+
|
444 |
+
# Link its dependencies
|
445 |
+
TARGET_LINK_LIBRARIES(Math Common)
|
446 |
+
+TARGET_INCLUDE_DIRECTORIES(Math PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>)
|
447 |
+
|
448 |
+
# Install
|
449 |
+
INSTALL(FILES ${LIBRARY_FILES_H} DESTINATION "${INSTALL_INCLUDE_DIR}/Math" COMPONENT dev)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/portfile.cmake
ADDED
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO cdcseacave/openMVS
|
6 |
+
REF v1.1.1
|
7 |
+
SHA512 eeb15d0756f12136a1e7938a0eed97024d564eef3355f3bb6abf6c681e38919011e1a133d89ca360f463e7fed5feb8e0138a0fe9be4c25b6a13ba4b042aef3eb
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
fix-build.patch
|
11 |
+
fix-build-boost-1_77_0.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES
|
16 |
+
cuda OpenMVS_USE_CUDA
|
17 |
+
openmp OpenMVS_USE_OPENMP
|
18 |
+
)
|
19 |
+
|
20 |
+
file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake")
|
21 |
+
file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake")
|
22 |
+
file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake")
|
23 |
+
|
24 |
+
vcpkg_cmake_configure(
|
25 |
+
SOURCE_PATH ${SOURCE_PATH}
|
26 |
+
OPTIONS ${FEATURE_OPTIONS}
|
27 |
+
-DOpenMVS_USE_NONFREE=ON
|
28 |
+
-DOpenMVS_USE_CERES=OFF
|
29 |
+
-DOpenMVS_USE_FAST_FLOAT2INT=ON
|
30 |
+
-DOpenMVS_USE_FAST_INVSQRT=OFF
|
31 |
+
-DOpenMVS_USE_FAST_CBRT=ON
|
32 |
+
-DOpenMVS_USE_SSE=ON
|
33 |
+
-DOpenMVS_USE_OPENGL=ON
|
34 |
+
-DOpenMVS_USE_BREAKPAD=OFF
|
35 |
+
OPTIONS_RELEASE
|
36 |
+
-DOpenMVS_BUILD_TOOLS=ON
|
37 |
+
OPTIONS_DEBUG
|
38 |
+
-DOpenMVS_BUILD_TOOLS=OFF
|
39 |
+
)
|
40 |
+
|
41 |
+
vcpkg_cmake_install()
|
42 |
+
|
43 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
44 |
+
|
45 |
+
vcpkg_fixup_cmake_targets()
|
46 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE)
|
47 |
+
string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
48 |
+
string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
49 |
+
string(REPLACE "bin/DensifyPointCloud" "tools/openmvs/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
50 |
+
string(REPLACE "bin/ReconstructMesh" "tools/openmvs/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
51 |
+
string(REPLACE "bin/RefineMesh" "tools/openmvs/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
52 |
+
string(REPLACE "bin/TextureMesh" "tools/openmvs/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
53 |
+
string(REPLACE "bin/Viewer" "tools/openmvs/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}")
|
54 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}")
|
55 |
+
|
56 |
+
vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
|
57 |
+
DensifyPointCloud
|
58 |
+
InterfaceCOLMAP
|
59 |
+
InterfaceVisualSFM
|
60 |
+
ReconstructMesh
|
61 |
+
RefineMesh
|
62 |
+
TextureMesh
|
63 |
+
Viewer
|
64 |
+
)
|
65 |
+
|
66 |
+
set(OPENMVG_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/openmvg")
|
67 |
+
set(OPENMVS_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/${PORT}")
|
68 |
+
set(SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH "${OPENMVG_TOOLS_PATH}/sensor_width_camera_database.txt")
|
69 |
+
configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgMvsPipeline.py" @ONLY)
|
70 |
+
file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
71 |
+
|
72 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openmvs/vcpkg.json
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openmvs",
|
3 |
+
"version": "1.1.1",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
|
6 |
+
"homepage": "https://cdcseacave.github.io/openMVS",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-iostreams",
|
9 |
+
"boost-program-options",
|
10 |
+
"boost-serialization",
|
11 |
+
"boost-system",
|
12 |
+
"boost-throw-exception",
|
13 |
+
{
|
14 |
+
"name": "cgal",
|
15 |
+
"default-features": false
|
16 |
+
},
|
17 |
+
"eigen3",
|
18 |
+
"glew",
|
19 |
+
"glfw3",
|
20 |
+
"libpng",
|
21 |
+
"opencv",
|
22 |
+
{
|
23 |
+
"name": "openmvg",
|
24 |
+
"features": [
|
25 |
+
"software"
|
26 |
+
],
|
27 |
+
"platform": "!(windows & static)"
|
28 |
+
},
|
29 |
+
"tiff",
|
30 |
+
"vcglib",
|
31 |
+
{
|
32 |
+
"name": "vcpkg-cmake",
|
33 |
+
"host": true
|
34 |
+
},
|
35 |
+
"zlib"
|
36 |
+
],
|
37 |
+
"features": {
|
38 |
+
"cuda": {
|
39 |
+
"description": "CUDA support for openmvs",
|
40 |
+
"dependencies": [
|
41 |
+
"cuda"
|
42 |
+
]
|
43 |
+
},
|
44 |
+
"openmp": {
|
45 |
+
"description": "OpenMP support for openmvs"
|
46 |
+
}
|
47 |
+
}
|
48 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/inherit_from_parent_or_project_defaults.patch
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
|
2 |
+
index 7f54d04..08a49fe 100644
|
3 |
+
--- a/Source/Drivers/Kinect/Kinect.vcxproj
|
4 |
+
+++ b/Source/Drivers/Kinect/Kinect.vcxproj
|
5 |
+
@@ -72,28 +72,29 @@
|
6 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
7 |
+
<OutDir>$(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\</OutDir>
|
8 |
+
<IntDir>$(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
|
9 |
+
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include</IncludePath>
|
10 |
+
- <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;</LibraryPath>
|
11 |
+
+ <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
|
12 |
+
+ <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)</LibraryPath>
|
13 |
+
<LinkIncremental>true</LinkIncremental>
|
14 |
+
</PropertyGroup>
|
15 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
16 |
+
<OutDir>$(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\</OutDir>
|
17 |
+
<IntDir>$(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
|
18 |
+
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
|
19 |
+
- <LibraryPath>$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
|
20 |
+
+ <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
|
21 |
+
+ <LibraryPath>$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath)</LibraryPath>
|
22 |
+
<LinkIncremental>true</LinkIncremental>
|
23 |
+
</PropertyGroup>
|
24 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
25 |
+
<OutDir>$(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\</OutDir>
|
26 |
+
<IntDir>$(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
|
27 |
+
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
|
28 |
+
- <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;</LibraryPath>
|
29 |
+
+ <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
|
30 |
+
+ <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(LibraryPath)</LibraryPath>
|
31 |
+
<LinkIncremental>false</LinkIncremental>
|
32 |
+
</PropertyGroup>
|
33 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
34 |
+
<OutDir>$(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\</OutDir>
|
35 |
+
<IntDir>$(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir>
|
36 |
+
- <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include</IncludePath>
|
37 |
+
+ <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(IncludePath)</IncludePath>
|
38 |
+
+ <LibraryPath>$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;$(LibraryPath)</LibraryPath>
|
39 |
+
<LinkIncremental>false</LinkIncremental>
|
40 |
+
</PropertyGroup>
|
41 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/openni2deploy.ps1
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Note: This function signature and behavior is depended upon by applocal.ps1
|
2 |
+
|
3 |
+
function deployOpenNI2([string]$targetBinaryDir, [string]$installedDir, [string]$targetBinaryName) {
|
4 |
+
if ($targetBinaryName -like "OpenNI2.dll") {
|
5 |
+
if(Test-Path "$installedDir\bin\OpenNI2\OpenNI.ini") {
|
6 |
+
Write-Verbose " Deploying OpenNI2 Initialization"
|
7 |
+
deployBinary "$targetBinaryDir" "$installedDir\bin\OpenNI2" "OpenNI.ini"
|
8 |
+
}
|
9 |
+
if(Test-Path "$installedDir\bin\OpenNI2\Drivers") {
|
10 |
+
Write-Verbose " Deploying OpenNI2 Drivers"
|
11 |
+
New-Item "$targetBinaryDir\OpenNI2\Drivers" -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
|
12 |
+
Get-ChildItem "$installedDir\bin\OpenNI2\Drivers\*.*" -include "*.dll","*.ini" | % {
|
13 |
+
deployBinary "$targetBinaryDir\OpenNI2\Drivers" "$installedDir\bin\OpenNI2\Drivers" $_.Name
|
14 |
+
}
|
15 |
+
}
|
16 |
+
}
|
17 |
+
}
|
18 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/portfile.cmake
ADDED
@@ -0,0 +1,213 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
2 |
+
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
|
3 |
+
endif()
|
4 |
+
|
5 |
+
find_path(COR_H_PATH cor.h)
|
6 |
+
if(COR_H_PATH MATCHES "NOTFOUND")
|
7 |
+
message(FATAL_ERROR "Could not find <cor.h>. Ensure the NETFXSDK is installed.")
|
8 |
+
endif()
|
9 |
+
get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE)
|
10 |
+
|
11 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
|
12 |
+
|
13 |
+
vcpkg_from_github(
|
14 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
15 |
+
REPO OpenNI/OpenNI2
|
16 |
+
REF 2.2-beta2
|
17 |
+
SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
|
18 |
+
HEAD_REF master
|
19 |
+
PATCHES upgrade_projects.patch
|
20 |
+
inherit_from_parent_or_project_defaults.patch
|
21 |
+
replace_environment_variable.patch
|
22 |
+
)
|
23 |
+
|
24 |
+
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
25 |
+
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
26 |
+
file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
|
27 |
+
|
28 |
+
file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
|
29 |
+
configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY)
|
30 |
+
|
31 |
+
# Build OpenNI2
|
32 |
+
vcpkg_build_msbuild(
|
33 |
+
PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln"
|
34 |
+
OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/"
|
35 |
+
)
|
36 |
+
|
37 |
+
# Install OpenNI2
|
38 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
39 |
+
set(PLATFORM Win32)
|
40 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
41 |
+
set(PLATFORM x64)
|
42 |
+
endif()
|
43 |
+
|
44 |
+
set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include")
|
45 |
+
set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release")
|
46 |
+
set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug")
|
47 |
+
set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config)
|
48 |
+
set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty")
|
49 |
+
|
50 |
+
file(
|
51 |
+
INSTALL
|
52 |
+
"${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h"
|
53 |
+
DESTINATION
|
54 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm
|
55 |
+
)
|
56 |
+
|
57 |
+
file(
|
58 |
+
INSTALL
|
59 |
+
"${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h"
|
60 |
+
"${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h"
|
61 |
+
DESTINATION
|
62 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/Driver
|
63 |
+
)
|
64 |
+
|
65 |
+
file(
|
66 |
+
INSTALL
|
67 |
+
"${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h"
|
68 |
+
DESTINATION
|
69 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm
|
70 |
+
)
|
71 |
+
|
72 |
+
file(
|
73 |
+
INSTALL
|
74 |
+
"${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h"
|
75 |
+
DESTINATION
|
76 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86
|
77 |
+
)
|
78 |
+
|
79 |
+
file(
|
80 |
+
INSTALL
|
81 |
+
"${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h"
|
82 |
+
DESTINATION
|
83 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX
|
84 |
+
)
|
85 |
+
|
86 |
+
file(
|
87 |
+
INSTALL
|
88 |
+
"${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h"
|
89 |
+
DESTINATION
|
90 |
+
${CURRENT_PACKAGES_DIR}/include/openni2/Win32
|
91 |
+
)
|
92 |
+
|
93 |
+
file(
|
94 |
+
INSTALL
|
95 |
+
"${SOURCE_INCLUDE_PATH}/OniCAPI.h"
|
96 |
+
"${SOURCE_INCLUDE_PATH}/OniCEnums.h"
|
97 |
+
"${SOURCE_INCLUDE_PATH}/OniCProperties.h"
|
98 |
+
"${SOURCE_INCLUDE_PATH}/OniCTypes.h"
|
99 |
+
"${SOURCE_INCLUDE_PATH}/OniEnums.h"
|
100 |
+
"${SOURCE_INCLUDE_PATH}/OniPlatform.h"
|
101 |
+
"${SOURCE_INCLUDE_PATH}/OniProperties.h"
|
102 |
+
"${SOURCE_INCLUDE_PATH}/OniVersion.h"
|
103 |
+
"${SOURCE_INCLUDE_PATH}/OpenNI.h"
|
104 |
+
"${SOURCE_INCLUDE_PATH}/PrimeSense.h"
|
105 |
+
"${SOURCE_INCLUDE_PATH}/PS1080.h"
|
106 |
+
"${SOURCE_INCLUDE_PATH}/PSLink.h"
|
107 |
+
DESTINATION
|
108 |
+
${CURRENT_PACKAGES_DIR}/include/openni2
|
109 |
+
)
|
110 |
+
|
111 |
+
file(
|
112 |
+
INSTALL
|
113 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib"
|
114 |
+
DESTINATION
|
115 |
+
${CURRENT_PACKAGES_DIR}/lib
|
116 |
+
)
|
117 |
+
|
118 |
+
file(
|
119 |
+
INSTALL
|
120 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib"
|
121 |
+
DESTINATION
|
122 |
+
${CURRENT_PACKAGES_DIR}/debug/lib
|
123 |
+
)
|
124 |
+
|
125 |
+
file(
|
126 |
+
INSTALL
|
127 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
|
128 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll"
|
129 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll"
|
130 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
|
131 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll"
|
132 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
|
133 |
+
DESTINATION
|
134 |
+
${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
|
135 |
+
)
|
136 |
+
|
137 |
+
file(
|
138 |
+
INSTALL
|
139 |
+
"${SOURCE_CONFIG_PATH}/OpenNI.ini"
|
140 |
+
DESTINATION
|
141 |
+
${CURRENT_PACKAGES_DIR}/bin/OpenNI2
|
142 |
+
)
|
143 |
+
|
144 |
+
file(
|
145 |
+
INSTALL
|
146 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll"
|
147 |
+
DESTINATION
|
148 |
+
${CURRENT_PACKAGES_DIR}/bin
|
149 |
+
)
|
150 |
+
|
151 |
+
file(
|
152 |
+
INSTALL
|
153 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll"
|
154 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/OniFile.dll"
|
155 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PS1080.dll"
|
156 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
|
157 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll"
|
158 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
|
159 |
+
DESTINATION
|
160 |
+
${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
|
161 |
+
)
|
162 |
+
|
163 |
+
file(
|
164 |
+
INSTALL
|
165 |
+
"${SOURCE_CONFIG_PATH}/OpenNI.ini"
|
166 |
+
DESTINATION
|
167 |
+
${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2
|
168 |
+
)
|
169 |
+
|
170 |
+
file(
|
171 |
+
INSTALL
|
172 |
+
"${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll"
|
173 |
+
DESTINATION
|
174 |
+
${CURRENT_PACKAGES_DIR}/debug/bin
|
175 |
+
)
|
176 |
+
|
177 |
+
file(
|
178 |
+
INSTALL
|
179 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
|
180 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll"
|
181 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll"
|
182 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
|
183 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll"
|
184 |
+
"${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini"
|
185 |
+
DESTINATION
|
186 |
+
${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
|
187 |
+
)
|
188 |
+
|
189 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
190 |
+
set(NUMBEROFBIT 32)
|
191 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
192 |
+
set(NUMBEROFBIT 64)
|
193 |
+
endif()
|
194 |
+
|
195 |
+
file(
|
196 |
+
INSTALL
|
197 |
+
"${SOURCE_THIRDPARTY_PATH}/GL/glut${NUMBEROFBIT}.dll"
|
198 |
+
"${SOURCE_BIN_PATH_RELEASE}/NiViewer.exe"
|
199 |
+
"${SOURCE_CONFIG_PATH}/OpenNI.ini"
|
200 |
+
"${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll"
|
201 |
+
"${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe"
|
202 |
+
"${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe"
|
203 |
+
DESTINATION
|
204 |
+
${CURRENT_PACKAGES_DIR}/tools/openni2
|
205 |
+
)
|
206 |
+
|
207 |
+
# Deploy Script
|
208 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/OpenNI2)
|
209 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2)
|
210 |
+
|
211 |
+
# Handle copyright
|
212 |
+
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2)
|
213 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/replace_environment_variable.patch
ADDED
@@ -0,0 +1,76 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
|
2 |
+
index 08a49fe..7fd8620 100644
|
3 |
+
--- a/Source/Drivers/Kinect/Kinect.vcxproj
|
4 |
+
+++ b/Source/Drivers/Kinect/Kinect.vcxproj
|
5 |
+
@@ -101,7 +101,7 @@
|
6 |
+
<ClCompile>
|
7 |
+
<WarningLevel>Level3</WarningLevel>
|
8 |
+
<Optimization>Disabled</Optimization>
|
9 |
+
- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
10 |
+
+ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
11 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
|
12 |
+
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
13 |
+
<TreatWarningAsError>false</TreatWarningAsError>
|
14 |
+
@@ -109,7 +109,7 @@
|
15 |
+
<Link>
|
16 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
17 |
+
<AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
18 |
+
- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
|
19 |
+
+ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib</AdditionalLibraryDirectories>
|
20 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
21 |
+
</Link>
|
22 |
+
</ItemDefinitionGroup>
|
23 |
+
@@ -117,7 +117,7 @@
|
24 |
+
<ClCompile>
|
25 |
+
<WarningLevel>Level3</WarningLevel>
|
26 |
+
<Optimization>Disabled</Optimization>
|
27 |
+
- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
28 |
+
+ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
29 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
|
30 |
+
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
31 |
+
<TreatWarningAsError>false</TreatWarningAsError>
|
32 |
+
@@ -125,7 +125,7 @@
|
33 |
+
<Link>
|
34 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
35 |
+
<AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
36 |
+
- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
|
37 |
+
+ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib</AdditionalLibraryDirectories>
|
38 |
+
<IgnoreSpecificDefaultLibraries>
|
39 |
+
</IgnoreSpecificDefaultLibraries>
|
40 |
+
<IgnoreAllDefaultLibraries>
|
41 |
+
@@ -139,7 +139,7 @@
|
42 |
+
<Optimization>MaxSpeed</Optimization>
|
43 |
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
44 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
45 |
+
- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
46 |
+
+ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
47 |
+
<TreatWarningAsError>false</TreatWarningAsError>
|
48 |
+
</ClCompile>
|
49 |
+
<Link>
|
50 |
+
@@ -147,7 +147,7 @@
|
51 |
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
52 |
+
<OptimizeReferences>true</OptimizeReferences>
|
53 |
+
<AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
54 |
+
- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
|
55 |
+
+ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib</AdditionalLibraryDirectories>
|
56 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
57 |
+
</Link>
|
58 |
+
</ItemDefinitionGroup>
|
59 |
+
@@ -157,7 +157,7 @@
|
60 |
+
<Optimization>MaxSpeed</Optimization>
|
61 |
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
62 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
63 |
+
- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
64 |
+
+ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
|
65 |
+
<TreatWarningAsError>false</TreatWarningAsError>
|
66 |
+
</ClCompile>
|
67 |
+
<Link>
|
68 |
+
@@ -165,7 +165,7 @@
|
69 |
+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
70 |
+
<OptimizeReferences>true</OptimizeReferences>
|
71 |
+
<AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
72 |
+
- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
|
73 |
+
+ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib</AdditionalLibraryDirectories>
|
74 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
75 |
+
</Link>
|
76 |
+
</ItemDefinitionGroup>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/upgrade_projects.patch
ADDED
@@ -0,0 +1,1572 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
|
2 |
+
index fe63dbf..6050e8f 100644
|
3 |
+
--- a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
|
4 |
+
+++ b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
|
5 |
+
@@ -2,4 +2,4 @@
|
6 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
7 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
8 |
+
<ItemGroup Label="ProjectConfigurations">
|
9 |
+
<ProjectConfiguration Include="Debug|Win32">
|
10 |
+
<Configuration>Debug</Configuration>
|
11 |
+
@@ -27,23 +27,27 @@
|
12 |
+
<ConfigurationType>Application</ConfigurationType>
|
13 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
14 |
+
<CharacterSet>MultiByte</CharacterSet>
|
15 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
16 |
+
</PropertyGroup>
|
17 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
18 |
+
<ConfigurationType>Application</ConfigurationType>
|
19 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
20 |
+
<CharacterSet>MultiByte</CharacterSet>
|
21 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
22 |
+
</PropertyGroup>
|
23 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
24 |
+
<ConfigurationType>Application</ConfigurationType>
|
25 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
26 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
27 |
+
<CharacterSet>MultiByte</CharacterSet>
|
28 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
29 |
+
</PropertyGroup>
|
30 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
31 |
+
<ConfigurationType>Application</ConfigurationType>
|
32 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
33 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
34 |
+
<CharacterSet>MultiByte</CharacterSet>
|
35 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
36 |
+
</PropertyGroup>
|
37 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
38 |
+
<ImportGroup Label="ExtensionSettings">
|
39 |
+
@@ -84,7 +88,7 @@
|
40 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
41 |
+
<WarningLevel>Level4</WarningLevel>
|
42 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
43 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
44 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
45 |
+
<MinimalRebuild>
|
46 |
+
</MinimalRebuild>
|
47 |
+
</ClCompile>
|
48 |
+
@@ -105,7 +109,7 @@
|
49 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
50 |
+
<WarningLevel>Level4</WarningLevel>
|
51 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
52 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
53 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
54 |
+
<MinimalRebuild>
|
55 |
+
</MinimalRebuild>
|
56 |
+
</ClCompile>
|
57 |
+
@@ -133,7 +137,7 @@
|
58 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
59 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
60 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
61 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
62 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
63 |
+
</ClCompile>
|
64 |
+
<Link>
|
65 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
66 |
+
@@ -142,6 +146,7 @@
|
67 |
+
<AdditionalDependencies>glut32.lib;OpenNI2.lib;MWClosestPoint.lib</AdditionalDependencies>
|
68 |
+
<AdditionalLibraryDirectories>$(OutDir);..\..\ThirdParty\GL</AdditionalLibraryDirectories>
|
69 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
70 |
+
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
71 |
+
</Link>
|
72 |
+
<ResourceCompile>
|
73 |
+
<AdditionalIncludeDirectories>..\..\Include</AdditionalIncludeDirectories>
|
74 |
+
@@ -161,7 +166,7 @@
|
75 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
76 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
77 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
78 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
79 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
80 |
+
</ClCompile>
|
81 |
+
<Link>
|
82 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
83 |
+
diff --git a/Samples/EventBasedRead/EventBasedRead.vcxproj b/Samples/EventBasedRead/EventBasedRead.vcxproj
|
84 |
+
index f67db7a..ffe19ac 100644
|
85 |
+
--- a/Samples/EventBasedRead/EventBasedRead.vcxproj
|
86 |
+
+++ b/Samples/EventBasedRead/EventBasedRead.vcxproj
|
87 |
+
@@ -2,4 +2,4 @@
|
88 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
89 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
90 |
+
<ItemGroup Label="ProjectConfigurations">
|
91 |
+
<ProjectConfiguration Include="Debug|Win32">
|
92 |
+
<Configuration>Debug</Configuration>
|
93 |
+
@@ -27,23 +27,27 @@
|
94 |
+
<ConfigurationType>Application</ConfigurationType>
|
95 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
96 |
+
<CharacterSet>MultiByte</CharacterSet>
|
97 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
98 |
+
</PropertyGroup>
|
99 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
100 |
+
<ConfigurationType>Application</ConfigurationType>
|
101 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
102 |
+
<CharacterSet>MultiByte</CharacterSet>
|
103 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
104 |
+
</PropertyGroup>
|
105 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
106 |
+
<ConfigurationType>Application</ConfigurationType>
|
107 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
108 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
109 |
+
<CharacterSet>MultiByte</CharacterSet>
|
110 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
111 |
+
</PropertyGroup>
|
112 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
113 |
+
<ConfigurationType>Application</ConfigurationType>
|
114 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
115 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
116 |
+
<CharacterSet>MultiByte</CharacterSet>
|
117 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
118 |
+
</PropertyGroup>
|
119 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
120 |
+
<ImportGroup Label="ExtensionSettings">
|
121 |
+
@@ -83,7 +87,7 @@
|
122 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
123 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
124 |
+
<WarningLevel>Level4</WarningLevel>
|
125 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
126 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
127 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
128 |
+
<MinimalRebuild>
|
129 |
+
</MinimalRebuild>
|
130 |
+
@@ -101,7 +105,7 @@
|
131 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
132 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
133 |
+
<WarningLevel>Level4</WarningLevel>
|
134 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
135 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
136 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
137 |
+
<MinimalRebuild>
|
138 |
+
</MinimalRebuild>
|
139 |
+
@@ -119,7 +123,7 @@
|
140 |
+
<Optimization>MaxSpeed</Optimization>
|
141 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
142 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
143 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
144 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
145 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
146 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
147 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
148 |
+
@@ -144,7 +148,7 @@
|
149 |
+
<Optimization>MaxSpeed</Optimization>
|
150 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
151 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
152 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
153 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
154 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
155 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
156 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
157 |
+
diff --git a/Samples/MWClosestPoint/MWClosestPoint.vcxproj b/Samples/MWClosestPoint/MWClosestPoint.vcxproj
|
158 |
+
index 74cafe7..5844506 100644
|
159 |
+
--- a/Samples/MWClosestPoint/MWClosestPoint.vcxproj
|
160 |
+
+++ b/Samples/MWClosestPoint/MWClosestPoint.vcxproj
|
161 |
+
@@ -2,4 +2,4 @@
|
162 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
163 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
164 |
+
<ItemGroup Label="ProjectConfigurations">
|
165 |
+
<ProjectConfiguration Include="Debug|Win32">
|
166 |
+
<Configuration>Debug</Configuration>
|
167 |
+
@@ -27,23 +27,27 @@
|
168 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
169 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
170 |
+
<CharacterSet>MultiByte</CharacterSet>
|
171 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
172 |
+
</PropertyGroup>
|
173 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
174 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
175 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
176 |
+
<CharacterSet>MultiByte</CharacterSet>
|
177 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
178 |
+
</PropertyGroup>
|
179 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
180 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
181 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
182 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
183 |
+
<CharacterSet>MultiByte</CharacterSet>
|
184 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
185 |
+
</PropertyGroup>
|
186 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
187 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
188 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
189 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
190 |
+
<CharacterSet>MultiByte</CharacterSet>
|
191 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
192 |
+
</PropertyGroup>
|
193 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
194 |
+
<ImportGroup Label="ExtensionSettings">
|
195 |
+
@@ -84,7 +88,7 @@
|
196 |
+
<AdditionalIncludeDirectories>..\..\Include</AdditionalIncludeDirectories>
|
197 |
+
<PreprocessorDefinitions>_CLOSEST_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
198 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
199 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
200 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
201 |
+
<MinimalRebuild>
|
202 |
+
</MinimalRebuild>
|
203 |
+
</ClCompile>
|
204 |
+
@@ -105,7 +109,7 @@
|
205 |
+
<AdditionalIncludeDirectories>..\..\Include</AdditionalIncludeDirectories>
|
206 |
+
<PreprocessorDefinitions>_CLOSEST_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
207 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
208 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
209 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
210 |
+
<MinimalRebuild>
|
211 |
+
</MinimalRebuild>
|
212 |
+
</ClCompile>
|
213 |
+
@@ -134,7 +138,7 @@
|
214 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
215 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
216 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
217 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
218 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
219 |
+
</ClCompile>
|
220 |
+
<Link>
|
221 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
222 |
+
@@ -163,7 +167,7 @@
|
223 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
224 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
225 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
226 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
227 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
228 |
+
</ClCompile>
|
229 |
+
<Link>
|
230 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
231 |
+
diff --git a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
|
232 |
+
index 063ec37..deb7c17 100644
|
233 |
+
--- a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
|
234 |
+
+++ b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
|
235 |
+
@@ -2,4 +2,4 @@
|
236 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
237 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
238 |
+
<ItemGroup Label="ProjectConfigurations">
|
239 |
+
<ProjectConfiguration Include="Debug|Win32">
|
240 |
+
<Configuration>Debug</Configuration>
|
241 |
+
@@ -27,23 +27,27 @@
|
242 |
+
<ConfigurationType>Application</ConfigurationType>
|
243 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
244 |
+
<CharacterSet>MultiByte</CharacterSet>
|
245 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
246 |
+
</PropertyGroup>
|
247 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
248 |
+
<ConfigurationType>Application</ConfigurationType>
|
249 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
250 |
+
<CharacterSet>MultiByte</CharacterSet>
|
251 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
252 |
+
</PropertyGroup>
|
253 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
254 |
+
<ConfigurationType>Application</ConfigurationType>
|
255 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
256 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
257 |
+
<CharacterSet>MultiByte</CharacterSet>
|
258 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
259 |
+
</PropertyGroup>
|
260 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
261 |
+
<ConfigurationType>Application</ConfigurationType>
|
262 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
263 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
264 |
+
<CharacterSet>MultiByte</CharacterSet>
|
265 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
266 |
+
</PropertyGroup>
|
267 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
268 |
+
<ImportGroup Label="ExtensionSettings">
|
269 |
+
@@ -83,7 +87,7 @@
|
270 |
+
<Optimization>Disabled</Optimization>
|
271 |
+
<AdditionalIncludeDirectories>..\MWClosestPoint;..\..\Include</AdditionalIncludeDirectories>
|
272 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
273 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
274 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
275 |
+
<MinimalRebuild>
|
276 |
+
</MinimalRebuild>
|
277 |
+
</ClCompile>
|
278 |
+
@@ -103,7 +107,7 @@
|
279 |
+
<Optimization>Disabled</Optimization>
|
280 |
+
<AdditionalIncludeDirectories>..\MWClosestPoint;..\..\Include</AdditionalIncludeDirectories>
|
281 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
282 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
283 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
284 |
+
<MinimalRebuild>
|
285 |
+
</MinimalRebuild>
|
286 |
+
</ClCompile>
|
287 |
+
@@ -131,7 +135,7 @@
|
288 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
289 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
290 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
291 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
292 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
293 |
+
</ClCompile>
|
294 |
+
<Link>
|
295 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
296 |
+
@@ -159,7 +163,7 @@
|
297 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
298 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
299 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
300 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
301 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
302 |
+
</ClCompile>
|
303 |
+
<Link>
|
304 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
305 |
+
diff --git a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
|
306 |
+
index d021c0d..85a0d4f 100644
|
307 |
+
--- a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
|
308 |
+
+++ b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
|
309 |
+
@@ -2,4 +2,4 @@
|
310 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
311 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
312 |
+
<ItemGroup Label="ProjectConfigurations">
|
313 |
+
<ProjectConfiguration Include="Debug|Win32">
|
314 |
+
<Configuration>Debug</Configuration>
|
315 |
+
@@ -27,23 +27,27 @@
|
316 |
+
<ConfigurationType>Application</ConfigurationType>
|
317 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
318 |
+
<CharacterSet>MultiByte</CharacterSet>
|
319 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
320 |
+
</PropertyGroup>
|
321 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
322 |
+
<ConfigurationType>Application</ConfigurationType>
|
323 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
324 |
+
<CharacterSet>MultiByte</CharacterSet>
|
325 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
326 |
+
</PropertyGroup>
|
327 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
328 |
+
<ConfigurationType>Application</ConfigurationType>
|
329 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
330 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
331 |
+
<CharacterSet>MultiByte</CharacterSet>
|
332 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
333 |
+
</PropertyGroup>
|
334 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
335 |
+
<ConfigurationType>Application</ConfigurationType>
|
336 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
337 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
338 |
+
<CharacterSet>MultiByte</CharacterSet>
|
339 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
340 |
+
</PropertyGroup>
|
341 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
342 |
+
<ImportGroup Label="ExtensionSettings">
|
343 |
+
@@ -84,7 +88,7 @@
|
344 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
345 |
+
<WarningLevel>Level4</WarningLevel>
|
346 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
347 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
348 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
349 |
+
<MinimalRebuild>
|
350 |
+
</MinimalRebuild>
|
351 |
+
</ClCompile>
|
352 |
+
@@ -102,7 +106,7 @@
|
353 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
354 |
+
<WarningLevel>Level4</WarningLevel>
|
355 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
356 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
357 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
358 |
+
<MinimalRebuild>
|
359 |
+
</MinimalRebuild>
|
360 |
+
</ClCompile>
|
361 |
+
@@ -127,7 +131,7 @@
|
362 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
363 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
364 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
365 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
366 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
367 |
+
</ClCompile>
|
368 |
+
<Link>
|
369 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
370 |
+
@@ -136,6 +140,7 @@
|
371 |
+
<AdditionalDependencies>glut32.lib;OpenNI2.lib</AdditionalDependencies>
|
372 |
+
<AdditionalLibraryDirectories>$(OutDir);..\..\ThirdParty\GL</AdditionalLibraryDirectories>
|
373 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
374 |
+
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
375 |
+
</Link>
|
376 |
+
</ItemDefinitionGroup>
|
377 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
378 |
+
@@ -152,7 +157,7 @@
|
379 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
380 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
381 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
382 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
383 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
384 |
+
</ClCompile>
|
385 |
+
<Link>
|
386 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
387 |
+
diff --git a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
|
388 |
+
index 15887ec..5fa8202 100644
|
389 |
+
--- a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
|
390 |
+
+++ b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
|
391 |
+
@@ -2,4 +2,4 @@
|
392 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
393 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
394 |
+
<ItemGroup Label="ProjectConfigurations">
|
395 |
+
<ProjectConfiguration Include="Debug|Win32">
|
396 |
+
<Configuration>Debug</Configuration>
|
397 |
+
@@ -27,23 +27,27 @@
|
398 |
+
<ConfigurationType>Application</ConfigurationType>
|
399 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
400 |
+
<CharacterSet>MultiByte</CharacterSet>
|
401 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
402 |
+
</PropertyGroup>
|
403 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
404 |
+
<ConfigurationType>Application</ConfigurationType>
|
405 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
406 |
+
<CharacterSet>MultiByte</CharacterSet>
|
407 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
408 |
+
</PropertyGroup>
|
409 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
410 |
+
<ConfigurationType>Application</ConfigurationType>
|
411 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
412 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
413 |
+
<CharacterSet>MultiByte</CharacterSet>
|
414 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
415 |
+
</PropertyGroup>
|
416 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
417 |
+
<ConfigurationType>Application</ConfigurationType>
|
418 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
419 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
420 |
+
<CharacterSet>MultiByte</CharacterSet>
|
421 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
422 |
+
</PropertyGroup>
|
423 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
424 |
+
<ImportGroup Label="ExtensionSettings">
|
425 |
+
@@ -83,7 +87,7 @@
|
426 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
427 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
428 |
+
<WarningLevel>Level4</WarningLevel>
|
429 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
430 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
431 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
432 |
+
<MinimalRebuild>
|
433 |
+
</MinimalRebuild>
|
434 |
+
@@ -101,7 +105,7 @@
|
435 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
436 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
437 |
+
<WarningLevel>Level4</WarningLevel>
|
438 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
439 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
440 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
441 |
+
<MinimalRebuild>
|
442 |
+
</MinimalRebuild>
|
443 |
+
@@ -119,7 +123,7 @@
|
444 |
+
<Optimization>MaxSpeed</Optimization>
|
445 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
446 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
447 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
448 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
449 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
450 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
451 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
452 |
+
@@ -144,7 +148,7 @@
|
453 |
+
<Optimization>MaxSpeed</Optimization>
|
454 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
455 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
456 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
457 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
458 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
459 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
460 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
461 |
+
diff --git a/Samples/SimpleRead/SimpleRead.vcxproj b/Samples/SimpleRead/SimpleRead.vcxproj
|
462 |
+
index de3942f..6ce41e3 100644
|
463 |
+
--- a/Samples/SimpleRead/SimpleRead.vcxproj
|
464 |
+
+++ b/Samples/SimpleRead/SimpleRead.vcxproj
|
465 |
+
@@ -2,4 +2,4 @@
|
466 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
467 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
468 |
+
<ItemGroup Label="ProjectConfigurations">
|
469 |
+
<ProjectConfiguration Include="Debug|Win32">
|
470 |
+
<Configuration>Debug</Configuration>
|
471 |
+
@@ -27,23 +27,27 @@
|
472 |
+
<ConfigurationType>Application</ConfigurationType>
|
473 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
474 |
+
<CharacterSet>MultiByte</CharacterSet>
|
475 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
476 |
+
</PropertyGroup>
|
477 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
478 |
+
<ConfigurationType>Application</ConfigurationType>
|
479 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
480 |
+
<CharacterSet>MultiByte</CharacterSet>
|
481 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
482 |
+
</PropertyGroup>
|
483 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
484 |
+
<ConfigurationType>Application</ConfigurationType>
|
485 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
486 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
487 |
+
<CharacterSet>MultiByte</CharacterSet>
|
488 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
489 |
+
</PropertyGroup>
|
490 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
491 |
+
<ConfigurationType>Application</ConfigurationType>
|
492 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
493 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
494 |
+
<CharacterSet>MultiByte</CharacterSet>
|
495 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
496 |
+
</PropertyGroup>
|
497 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
498 |
+
<ImportGroup Label="ExtensionSettings">
|
499 |
+
@@ -83,7 +87,7 @@
|
500 |
+
<AdditionalIncludeDirectories>..\Common;..\..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
501 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
502 |
+
<WarningLevel>Level4</WarningLevel>
|
503 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
504 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
505 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
506 |
+
<MinimalRebuild>
|
507 |
+
</MinimalRebuild>
|
508 |
+
@@ -101,7 +105,7 @@
|
509 |
+
<AdditionalIncludeDirectories>..\Common;..\..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
510 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
511 |
+
<WarningLevel>Level4</WarningLevel>
|
512 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
513 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
514 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
515 |
+
<MinimalRebuild>
|
516 |
+
</MinimalRebuild>
|
517 |
+
@@ -119,7 +123,7 @@
|
518 |
+
<Optimization>MaxSpeed</Optimization>
|
519 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
520 |
+
<AdditionalIncludeDirectories>..\Common;..\..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
521 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
522 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
523 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
524 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
525 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
526 |
+
@@ -144,7 +148,7 @@
|
527 |
+
<Optimization>MaxSpeed</Optimization>
|
528 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
529 |
+
<AdditionalIncludeDirectories>..\Common;..\..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
530 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
531 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
532 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
533 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
534 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
535 |
+
diff --git a/Samples/SimpleViewer/SimpleViewer.vcxproj b/Samples/SimpleViewer/SimpleViewer.vcxproj
|
536 |
+
index d693a1d..40621e1 100644
|
537 |
+
--- a/Samples/SimpleViewer/SimpleViewer.vcxproj
|
538 |
+
+++ b/Samples/SimpleViewer/SimpleViewer.vcxproj
|
539 |
+
@@ -2,4 +2,4 @@
|
540 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
541 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
542 |
+
<ItemGroup Label="ProjectConfigurations">
|
543 |
+
<ProjectConfiguration Include="Debug|Win32">
|
544 |
+
<Configuration>Debug</Configuration>
|
545 |
+
@@ -27,23 +27,27 @@
|
546 |
+
<ConfigurationType>Application</ConfigurationType>
|
547 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
548 |
+
<CharacterSet>MultiByte</CharacterSet>
|
549 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
550 |
+
</PropertyGroup>
|
551 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
552 |
+
<ConfigurationType>Application</ConfigurationType>
|
553 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
554 |
+
<CharacterSet>MultiByte</CharacterSet>
|
555 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
556 |
+
</PropertyGroup>
|
557 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
558 |
+
<ConfigurationType>Application</ConfigurationType>
|
559 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
560 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
561 |
+
<CharacterSet>MultiByte</CharacterSet>
|
562 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
563 |
+
</PropertyGroup>
|
564 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
565 |
+
<ConfigurationType>Application</ConfigurationType>
|
566 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
567 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
568 |
+
<CharacterSet>MultiByte</CharacterSet>
|
569 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
570 |
+
</PropertyGroup>
|
571 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
572 |
+
<ImportGroup Label="ExtensionSettings">
|
573 |
+
@@ -84,7 +88,7 @@
|
574 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
575 |
+
<WarningLevel>Level4</WarningLevel>
|
576 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
577 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
578 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
579 |
+
<MinimalRebuild>
|
580 |
+
</MinimalRebuild>
|
581 |
+
</ClCompile>
|
582 |
+
@@ -102,7 +106,7 @@
|
583 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
584 |
+
<WarningLevel>Level4</WarningLevel>
|
585 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
586 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
587 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
588 |
+
<MinimalRebuild>
|
589 |
+
</MinimalRebuild>
|
590 |
+
</ClCompile>
|
591 |
+
@@ -127,7 +131,7 @@
|
592 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
593 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
594 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
595 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
596 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
597 |
+
</ClCompile>
|
598 |
+
<Link>
|
599 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
600 |
+
@@ -136,6 +140,7 @@
|
601 |
+
<AdditionalDependencies>glut32.lib;OpenNI2.lib</AdditionalDependencies>
|
602 |
+
<AdditionalLibraryDirectories>$(OutDir);..\..\ThirdParty\GL</AdditionalLibraryDirectories>
|
603 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
604 |
+
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
605 |
+
</Link>
|
606 |
+
</ItemDefinitionGroup>
|
607 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
608 |
+
@@ -152,7 +157,7 @@
|
609 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
610 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
611 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
612 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
613 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
614 |
+
</ClCompile>
|
615 |
+
<Link>
|
616 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
617 |
+
diff --git a/Source/Core/OpenNI.vcxproj b/Source/Core/OpenNI.vcxproj
|
618 |
+
index 12189de..f176682 100644
|
619 |
+
--- a/Source/Core/OpenNI.vcxproj
|
620 |
+
+++ b/Source/Core/OpenNI.vcxproj
|
621 |
+
@@ -2,4 +2,4 @@
|
622 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
623 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
624 |
+
<ItemGroup Label="ProjectConfigurations">
|
625 |
+
<ProjectConfiguration Include="Debug|Win32">
|
626 |
+
<Configuration>Debug</Configuration>
|
627 |
+
@@ -27,23 +27,27 @@
|
628 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
629 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
630 |
+
<CharacterSet>MultiByte</CharacterSet>
|
631 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
632 |
+
</PropertyGroup>
|
633 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
634 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
635 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
636 |
+
<CharacterSet>MultiByte</CharacterSet>
|
637 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
638 |
+
</PropertyGroup>
|
639 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
640 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
641 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
642 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
643 |
+
<CharacterSet>MultiByte</CharacterSet>
|
644 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
645 |
+
</PropertyGroup>
|
646 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
647 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
648 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
649 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
650 |
+
<CharacterSet>MultiByte</CharacterSet>
|
651 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
652 |
+
</PropertyGroup>
|
653 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
654 |
+
<ImportGroup Label="ExtensionSettings">
|
655 |
+
@@ -88,7 +92,7 @@
|
656 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT</PreprocessorDefinitions>
|
657 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
658 |
+
<WarningLevel>Level4</WarningLevel>
|
659 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
660 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
661 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
662 |
+
<MinimalRebuild>
|
663 |
+
</MinimalRebuild>
|
664 |
+
@@ -110,7 +114,7 @@
|
665 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT</PreprocessorDefinitions>
|
666 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
667 |
+
<WarningLevel>Level4</WarningLevel>
|
668 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
669 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
670 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
671 |
+
<MinimalRebuild>
|
672 |
+
</MinimalRebuild>
|
673 |
+
@@ -132,7 +136,7 @@
|
674 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
675 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT</PreprocessorDefinitions>
|
676 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
677 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
678 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
679 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
680 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
681 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
682 |
+
@@ -161,7 +165,7 @@
|
683 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
684 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT</PreprocessorDefinitions>
|
685 |
+
<AdditionalIncludeDirectories>..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
686 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
687 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
688 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
689 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
690 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
691 |
+
diff --git a/Source/DepthUtils/DepthUtils.vcxproj b/Source/DepthUtils/DepthUtils.vcxproj
|
692 |
+
index dcab0b7..e474661 100644
|
693 |
+
--- a/Source/DepthUtils/DepthUtils.vcxproj
|
694 |
+
+++ b/Source/DepthUtils/DepthUtils.vcxproj
|
695 |
+
@@ -2,4 +2,4 @@
|
696 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
697 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
698 |
+
<ItemGroup Label="ProjectConfigurations">
|
699 |
+
<ProjectConfiguration Include="Debug|Win32">
|
700 |
+
<Configuration>Debug</Configuration>
|
701 |
+
@@ -35,23 +35,27 @@
|
702 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
703 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
704 |
+
<CharacterSet>MultiByte</CharacterSet>
|
705 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
706 |
+
</PropertyGroup>
|
707 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
708 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
709 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
710 |
+
<CharacterSet>MultiByte</CharacterSet>
|
711 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
712 |
+
</PropertyGroup>
|
713 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
714 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
715 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
716 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
717 |
+
<CharacterSet>MultiByte</CharacterSet>
|
718 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
719 |
+
</PropertyGroup>
|
720 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
721 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
722 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
723 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
724 |
+
<CharacterSet>MultiByte</CharacterSet>
|
725 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
726 |
+
</PropertyGroup>
|
727 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
728 |
+
<ImportGroup Label="ExtensionSettings">
|
729 |
+
@@ -94,7 +98,7 @@
|
730 |
+
<Optimization>Disabled</Optimization>
|
731 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT</PreprocessorDefinitions>
|
732 |
+
<WarningLevel>Level4</WarningLevel>
|
733 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
734 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
735 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
736 |
+
<MinimalRebuild>
|
737 |
+
</MinimalRebuild>
|
738 |
+
@@ -114,7 +118,7 @@
|
739 |
+
<Optimization>Disabled</Optimization>
|
740 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT</PreprocessorDefinitions>
|
741 |
+
<WarningLevel>Level4</WarningLevel>
|
742 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
743 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
744 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
745 |
+
<MinimalRebuild>
|
746 |
+
</MinimalRebuild>
|
747 |
+
@@ -134,7 +138,7 @@
|
748 |
+
<Optimization>MaxSpeed</Optimization>
|
749 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
750 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT</PreprocessorDefinitions>
|
751 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
752 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
753 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
754 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
755 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
756 |
+
@@ -160,7 +164,7 @@
|
757 |
+
<Optimization>MaxSpeed</Optimization>
|
758 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
759 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT</PreprocessorDefinitions>
|
760 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
761 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
762 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
763 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
764 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
765 |
+
diff --git a/Source/Drivers/DummyDevice/DummyDevice.vcxproj b/Source/Drivers/DummyDevice/DummyDevice.vcxproj
|
766 |
+
index 56c5944..0401f3d 100644
|
767 |
+
--- a/Source/Drivers/DummyDevice/DummyDevice.vcxproj
|
768 |
+
+++ b/Source/Drivers/DummyDevice/DummyDevice.vcxproj
|
769 |
+
@@ -2,4 +2,4 @@
|
770 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
771 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
772 |
+
<ItemGroup Label="ProjectConfigurations">
|
773 |
+
<ProjectConfiguration Include="Debug|Win32">
|
774 |
+
<Configuration>Debug</Configuration>
|
775 |
+
@@ -27,23 +27,27 @@
|
776 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
777 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
778 |
+
<CharacterSet>MultiByte</CharacterSet>
|
779 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
780 |
+
</PropertyGroup>
|
781 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
782 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
783 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
784 |
+
<CharacterSet>MultiByte</CharacterSet>
|
785 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
786 |
+
</PropertyGroup>
|
787 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
788 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
789 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
790 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
791 |
+
<CharacterSet>MultiByte</CharacterSet>
|
792 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
793 |
+
</PropertyGroup>
|
794 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
795 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
796 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
797 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
798 |
+
<CharacterSet>MultiByte</CharacterSet>
|
799 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
800 |
+
</PropertyGroup>
|
801 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
802 |
+
<ImportGroup Label="ExtensionSettings">
|
803 |
+
@@ -84,7 +88,7 @@
|
804 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT</PreprocessorDefinitions>
|
805 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
806 |
+
<WarningLevel>Level4</WarningLevel>
|
807 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
808 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
809 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
810 |
+
</ClCompile>
|
811 |
+
<Link>
|
812 |
+
@@ -104,7 +108,7 @@
|
813 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT</PreprocessorDefinitions>
|
814 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
815 |
+
<WarningLevel>Level4</WarningLevel>
|
816 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
817 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
818 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
819 |
+
</ClCompile>
|
820 |
+
<Link>
|
821 |
+
@@ -124,7 +128,7 @@
|
822 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
823 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT</PreprocessorDefinitions>
|
824 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include</AdditionalIncludeDirectories>
|
825 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
826 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
827 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
828 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
829 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
830 |
+
@@ -153,7 +157,7 @@
|
831 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
832 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT</PreprocessorDefinitions>
|
833 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include</AdditionalIncludeDirectories>
|
834 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
835 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
836 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
837 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
838 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
839 |
+
diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
|
840 |
+
index f54e8b2..6ea2656 100644
|
841 |
+
--- a/Source/Drivers/Kinect/Kinect.vcxproj
|
842 |
+
+++ b/Source/Drivers/Kinect/Kinect.vcxproj
|
843 |
+
@@ -2,4 +2,4 @@
|
844 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
845 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
846 |
+
<ItemGroup Label="ProjectConfigurations">
|
847 |
+
<ProjectConfiguration Include="Debug|Win32">
|
848 |
+
<Configuration>Debug</Configuration>
|
849 |
+
@@ -28,12 +28,14 @@
|
850 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
851 |
+
<CharacterSet>Unicode</CharacterSet>
|
852 |
+
<CLRSupport>true</CLRSupport>
|
853 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
854 |
+
</PropertyGroup>
|
855 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
856 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
857 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
858 |
+
<CharacterSet>Unicode</CharacterSet>
|
859 |
+
<CLRSupport>true</CLRSupport>
|
860 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
861 |
+
</PropertyGroup>
|
862 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
863 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
864 |
+
@@ -41,6 +43,7 @@
|
865 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
866 |
+
<CharacterSet>MultiByte</CharacterSet>
|
867 |
+
<CLRSupport>true</CLRSupport>
|
868 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
869 |
+
</PropertyGroup>
|
870 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
871 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
872 |
+
@@ -48,6 +51,7 @@
|
873 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
874 |
+
<CharacterSet>MultiByte</CharacterSet>
|
875 |
+
<CLRSupport>true</CLRSupport>
|
876 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
877 |
+
</PropertyGroup>
|
878 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
879 |
+
<ImportGroup Label="ExtensionSettings">
|
880 |
+
@@ -99,7 +103,7 @@
|
881 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
882 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
|
883 |
+
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
884 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
885 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
886 |
+
</ClCompile>
|
887 |
+
<Link>
|
888 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
889 |
+
@@ -115,7 +119,7 @@
|
890 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
891 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
|
892 |
+
<DisableLanguageExtensions>false</DisableLanguageExtensions>
|
893 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
894 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
895 |
+
</ClCompile>
|
896 |
+
<Link>
|
897 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
898 |
+
@@ -125,7 +129,7 @@
|
899 |
+
</IgnoreSpecificDefaultLibraries>
|
900 |
+
<IgnoreAllDefaultLibraries>
|
901 |
+
</IgnoreAllDefaultLibraries>
|
902 |
+
- <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
903 |
+
+ <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
904 |
+
</Link>
|
905 |
+
</ItemDefinitionGroup>
|
906 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
907 |
+
@@ -135,7 +139,7 @@
|
908 |
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
909 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
910 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
911 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
912 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
913 |
+
</ClCompile>
|
914 |
+
<Link>
|
915 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
916 |
+
@@ -153,7 +157,7 @@
|
917 |
+
<FunctionLevelLinking>true</FunctionLevelLinking>
|
918 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
919 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
|
920 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
921 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
922 |
+
</ClCompile>
|
923 |
+
<Link>
|
924 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
925 |
+
diff --git a/Source/Drivers/OniFile/OniFile.vcxproj b/Source/Drivers/OniFile/OniFile.vcxproj
|
926 |
+
index 9b173f7..e2f4391 100644
|
927 |
+
--- a/Source/Drivers/OniFile/OniFile.vcxproj
|
928 |
+
+++ b/Source/Drivers/OniFile/OniFile.vcxproj
|
929 |
+
@@ -2,4 +2,4 @@
|
930 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
931 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
932 |
+
<ItemGroup Label="ProjectConfigurations">
|
933 |
+
<ProjectConfiguration Include="Debug|Win32">
|
934 |
+
<Configuration>Debug</Configuration>
|
935 |
+
@@ -28,23 +28,27 @@
|
936 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
937 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
938 |
+
<CharacterSet>MultiByte</CharacterSet>
|
939 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
940 |
+
</PropertyGroup>
|
941 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
942 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
943 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
944 |
+
<CharacterSet>MultiByte</CharacterSet>
|
945 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
946 |
+
</PropertyGroup>
|
947 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
948 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
949 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
950 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
951 |
+
<CharacterSet>MultiByte</CharacterSet>
|
952 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
953 |
+
</PropertyGroup>
|
954 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
955 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
956 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
957 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
958 |
+
<CharacterSet>MultiByte</CharacterSet>
|
959 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
960 |
+
</PropertyGroup>
|
961 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
962 |
+
<ImportGroup Label="ExtensionSettings">
|
963 |
+
@@ -98,7 +102,7 @@
|
964 |
+
<Optimization>Disabled</Optimization>
|
965 |
+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
966 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG</AdditionalIncludeDirectories>
|
967 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
968 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
969 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
970 |
+
<MinimalRebuild>
|
971 |
+
</MinimalRebuild>
|
972 |
+
@@ -133,7 +137,7 @@
|
973 |
+
<Optimization>Disabled</Optimization>
|
974 |
+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
975 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG</AdditionalIncludeDirectories>
|
976 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
977 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
978 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
979 |
+
<MinimalRebuild>
|
980 |
+
</MinimalRebuild>
|
981 |
+
@@ -169,7 +173,7 @@
|
982 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
983 |
+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
984 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG</AdditionalIncludeDirectories>
|
985 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
986 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
987 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
988 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
989 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
990 |
+
@@ -212,7 +216,7 @@
|
991 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
992 |
+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
993 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG</AdditionalIncludeDirectories>
|
994 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
995 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
996 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
997 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
998 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
999 |
+
diff --git a/Source/Drivers/PS1080/PS1080.vcxproj b/Source/Drivers/PS1080/PS1080.vcxproj
|
1000 |
+
index 2a1154d..8495c28 100644
|
1001 |
+
--- a/Source/Drivers/PS1080/PS1080.vcxproj
|
1002 |
+
+++ b/Source/Drivers/PS1080/PS1080.vcxproj
|
1003 |
+
@@ -2,4 +2,4 @@
|
1004 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1005 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1006 |
+
<ItemGroup Label="ProjectConfigurations">
|
1007 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1008 |
+
<Configuration>Debug</Configuration>
|
1009 |
+
@@ -525,23 +525,27 @@
|
1010 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1011 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1012 |
+
<CharacterSet>Unicode</CharacterSet>
|
1013 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1014 |
+
</PropertyGroup>
|
1015 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1016 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1017 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1018 |
+
<CharacterSet>Unicode</CharacterSet>
|
1019 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1020 |
+
</PropertyGroup>
|
1021 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
1022 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1023 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1024 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1025 |
+
<CharacterSet>Unicode</CharacterSet>
|
1026 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1027 |
+
</PropertyGroup>
|
1028 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1029 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1030 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1031 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1032 |
+
<CharacterSet>Unicode</CharacterSet>
|
1033 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1034 |
+
</PropertyGroup>
|
1035 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1036 |
+
<ImportGroup Label="ExtensionSettings">
|
1037 |
+
@@ -587,7 +591,7 @@
|
1038 |
+
<Optimization>Disabled</Optimization>
|
1039 |
+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1040 |
+
<AdditionalIncludeDirectories>.\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils</AdditionalIncludeDirectories>
|
1041 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1042 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1043 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1044 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1045 |
+
<MinimalRebuild>
|
1046 |
+
@@ -612,7 +616,7 @@
|
1047 |
+
<Optimization>Disabled</Optimization>
|
1048 |
+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1049 |
+
<AdditionalIncludeDirectories>.\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils</AdditionalIncludeDirectories>
|
1050 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1051 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1052 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1053 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1054 |
+
<MinimalRebuild>
|
1055 |
+
@@ -638,7 +642,7 @@
|
1056 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1057 |
+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1058 |
+
<AdditionalIncludeDirectories>.\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils</AdditionalIncludeDirectories>
|
1059 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1060 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1061 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1062 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1063 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1064 |
+
@@ -670,7 +674,7 @@
|
1065 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1066 |
+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1067 |
+
<AdditionalIncludeDirectories>.\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils</AdditionalIncludeDirectories>
|
1068 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1069 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1070 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1071 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1072 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1073 |
+
diff --git a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
|
1074 |
+
index b9adfea..7446d5a 100644
|
1075 |
+
--- a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
|
1076 |
+
+++ b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
|
1077 |
+
@@ -2,4 +2,4 @@
|
1078 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1079 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1080 |
+
<ItemGroup Label="ProjectConfigurations">
|
1081 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1082 |
+
<Configuration>Debug</Configuration>
|
1083 |
+
@@ -28,19 +28,23 @@
|
1084 |
+
<ConfigurationType>Application</ConfigurationType>
|
1085 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1086 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1087 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1088 |
+
</PropertyGroup>
|
1089 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
1090 |
+
<ConfigurationType>Application</ConfigurationType>
|
1091 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1092 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1093 |
+
</PropertyGroup>
|
1094 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1095 |
+
<ConfigurationType>Application</ConfigurationType>
|
1096 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1097 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1098 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1099 |
+
</PropertyGroup>
|
1100 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1101 |
+
<ConfigurationType>Application</ConfigurationType>
|
1102 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1103 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1104 |
+
</PropertyGroup>
|
1105 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1106 |
+
<ImportGroup Label="ExtensionSettings">
|
1107 |
+
@@ -87,7 +91,7 @@
|
1108 |
+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
1109 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1110 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1111 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1112 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1113 |
+
</ClCompile>
|
1114 |
+
<Link>
|
1115 |
+
<AdditionalDependencies>XnLib.lib;OpenNI2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1116 |
+
@@ -95,7 +99,7 @@
|
1117 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
1118 |
+
<SubSystem>Console</SubSystem>
|
1119 |
+
<TargetMachine>MachineX86</TargetMachine>
|
1120 |
+
- <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
1121 |
+
+ <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
1122 |
+
</Link>
|
1123 |
+
</ItemDefinitionGroup>
|
1124 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
1125 |
+
@@ -114,7 +118,7 @@
|
1126 |
+
<WarningLevel>Level4</WarningLevel>
|
1127 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1128 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1129 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1130 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1131 |
+
</ClCompile>
|
1132 |
+
<Link>
|
1133 |
+
<AdditionalDependencies>XnLib.lib;OpenNI2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1134 |
+
@@ -139,7 +143,7 @@
|
1135 |
+
<WarningLevel>Level4</WarningLevel>
|
1136 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1137 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1138 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1139 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1140 |
+
</ClCompile>
|
1141 |
+
<Link>
|
1142 |
+
<AdditionalDependencies>XnLib.lib;OpenNI2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1143 |
+
@@ -169,7 +173,7 @@
|
1144 |
+
<WarningLevel>Level4</WarningLevel>
|
1145 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1146 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1147 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1148 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1149 |
+
</ClCompile>
|
1150 |
+
<Link>
|
1151 |
+
<AdditionalDependencies>XnLib.lib;OpenNI2.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1152 |
+
diff --git a/Source/Drivers/PSLink/PSLink.vcxproj b/Source/Drivers/PSLink/PSLink.vcxproj
|
1153 |
+
index 8915163..68a7e96 100644
|
1154 |
+
--- a/Source/Drivers/PSLink/PSLink.vcxproj
|
1155 |
+
+++ b/Source/Drivers/PSLink/PSLink.vcxproj
|
1156 |
+
@@ -2,4 +2,4 @@
|
1157 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1158 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1159 |
+
<ItemGroup Label="ProjectConfigurations">
|
1160 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1161 |
+
<Configuration>Debug</Configuration>
|
1162 |
+
@@ -28,19 +28,23 @@
|
1163 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1164 |
+
<CharacterSet>Unicode</CharacterSet>
|
1165 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1166 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1167 |
+
</PropertyGroup>
|
1168 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
1169 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1170 |
+
<CharacterSet>Unicode</CharacterSet>
|
1171 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1172 |
+
</PropertyGroup>
|
1173 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1174 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1175 |
+
<CharacterSet>Unicode</CharacterSet>
|
1176 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1177 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1178 |
+
</PropertyGroup>
|
1179 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1180 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1181 |
+
<CharacterSet>Unicode</CharacterSet>
|
1182 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1183 |
+
</PropertyGroup>
|
1184 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1185 |
+
<ImportGroup Label="ExtensionSettings">
|
1186 |
+
@@ -87,7 +91,7 @@
|
1187 |
+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
1188 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1189 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1190 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1191 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1192 |
+
</ClCompile>
|
1193 |
+
<Link>
|
1194 |
+
<AdditionalDependencies>XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1195 |
+
@@ -95,7 +99,7 @@
|
1196 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
1197 |
+
<SubSystem>Windows</SubSystem>
|
1198 |
+
<TargetMachine>MachineX86</TargetMachine>
|
1199 |
+
- <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
1200 |
+
+ <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
1201 |
+
</Link>
|
1202 |
+
</ItemDefinitionGroup>
|
1203 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
1204 |
+
@@ -115,7 +119,7 @@
|
1205 |
+
<WarningLevel>Level4</WarningLevel>
|
1206 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1207 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1208 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1209 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1210 |
+
</ClCompile>
|
1211 |
+
<Link>
|
1212 |
+
<AdditionalDependencies>XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1213 |
+
@@ -140,7 +144,7 @@
|
1214 |
+
<WarningLevel>Level4</WarningLevel>
|
1215 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1216 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1217 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1218 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1219 |
+
</ClCompile>
|
1220 |
+
<Link>
|
1221 |
+
<AdditionalDependencies>XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1222 |
+
@@ -170,7 +174,7 @@
|
1223 |
+
<WarningLevel>Level4</WarningLevel>
|
1224 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1225 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1226 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1227 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1228 |
+
</ClCompile>
|
1229 |
+
<Link>
|
1230 |
+
<AdditionalDependencies>XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1231 |
+
diff --git a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
|
1232 |
+
index e6c7c8c..26ff9c8 100644
|
1233 |
+
--- a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
|
1234 |
+
+++ b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
|
1235 |
+
@@ -2,4 +2,4 @@
|
1236 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1237 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1238 |
+
<ItemGroup Label="ProjectConfigurations">
|
1239 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1240 |
+
<Configuration>Debug</Configuration>
|
1241 |
+
@@ -28,19 +28,23 @@
|
1242 |
+
<ConfigurationType>Application</ConfigurationType>
|
1243 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1244 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1245 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1246 |
+
</PropertyGroup>
|
1247 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
1248 |
+
<ConfigurationType>Application</ConfigurationType>
|
1249 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1250 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1251 |
+
</PropertyGroup>
|
1252 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1253 |
+
<ConfigurationType>Application</ConfigurationType>
|
1254 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1255 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1256 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1257 |
+
</PropertyGroup>
|
1258 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1259 |
+
<ConfigurationType>Application</ConfigurationType>
|
1260 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1261 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1262 |
+
</PropertyGroup>
|
1263 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1264 |
+
<ImportGroup Label="ExtensionSettings">
|
1265 |
+
@@ -87,7 +91,7 @@
|
1266 |
+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
1267 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1268 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1269 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1270 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1271 |
+
</ClCompile>
|
1272 |
+
<Link>
|
1273 |
+
<AdditionalDependencies>OpenNI2.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1274 |
+
@@ -95,7 +99,7 @@
|
1275 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
1276 |
+
<SubSystem>Console</SubSystem>
|
1277 |
+
<TargetMachine>MachineX86</TargetMachine>
|
1278 |
+
- <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
1279 |
+
+ <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
|
1280 |
+
</Link>
|
1281 |
+
</ItemDefinitionGroup>
|
1282 |
+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
1283 |
+
@@ -114,7 +118,7 @@
|
1284 |
+
<WarningLevel>Level4</WarningLevel>
|
1285 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1286 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1287 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1288 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1289 |
+
</ClCompile>
|
1290 |
+
<Link>
|
1291 |
+
<AdditionalDependencies>OpenNI2.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1292 |
+
@@ -139,7 +143,7 @@
|
1293 |
+
<WarningLevel>Level4</WarningLevel>
|
1294 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1295 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1296 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1297 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1298 |
+
</ClCompile>
|
1299 |
+
<Link>
|
1300 |
+
<AdditionalDependencies>OpenNI2.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1301 |
+
@@ -169,7 +173,7 @@
|
1302 |
+
<WarningLevel>Level4</WarningLevel>
|
1303 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1304 |
+
<DisableSpecificWarnings>4250;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
1305 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1306 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1307 |
+
</ClCompile>
|
1308 |
+
<Link>
|
1309 |
+
<AdditionalDependencies>OpenNI2.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
1310 |
+
diff --git a/Source/Drivers/TestDevice/TestDevice.vcxproj b/Source/Drivers/TestDevice/TestDevice.vcxproj
|
1311 |
+
index e20a074..3777b2e 100644
|
1312 |
+
--- a/Source/Drivers/TestDevice/TestDevice.vcxproj
|
1313 |
+
+++ b/Source/Drivers/TestDevice/TestDevice.vcxproj
|
1314 |
+
@@ -2,4 +2,4 @@
|
1315 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1316 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1317 |
+
<ItemGroup Label="ProjectConfigurations">
|
1318 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1319 |
+
<Configuration>Debug</Configuration>
|
1320 |
+
@@ -27,23 +27,27 @@
|
1321 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1322 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1323 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1324 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1325 |
+
</PropertyGroup>
|
1326 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1327 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1328 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1329 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1330 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1331 |
+
</PropertyGroup>
|
1332 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
1333 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1334 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1335 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1336 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1337 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1338 |
+
</PropertyGroup>
|
1339 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1340 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1341 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1342 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1343 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1344 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1345 |
+
</PropertyGroup>
|
1346 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1347 |
+
<ImportGroup Label="ExtensionSettings">
|
1348 |
+
@@ -84,7 +88,7 @@
|
1349 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT</PreprocessorDefinitions>
|
1350 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1351 |
+
<WarningLevel>Level4</WarningLevel>
|
1352 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1353 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1354 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1355 |
+
</ClCompile>
|
1356 |
+
<Link>
|
1357 |
+
@@ -101,7 +105,7 @@
|
1358 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT</PreprocessorDefinitions>
|
1359 |
+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
1360 |
+
<WarningLevel>Level4</WarningLevel>
|
1361 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1362 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1363 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1364 |
+
</ClCompile>
|
1365 |
+
<Link>
|
1366 |
+
@@ -118,7 +122,7 @@
|
1367 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1368 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT</PreprocessorDefinitions>
|
1369 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include</AdditionalIncludeDirectories>
|
1370 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1371 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1372 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1373 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1374 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
1375 |
+
@@ -144,7 +148,7 @@
|
1376 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1377 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT</PreprocessorDefinitions>
|
1378 |
+
<AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include</AdditionalIncludeDirectories>
|
1379 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1380 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1381 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1382 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1383 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
1384 |
+
diff --git a/Source/Tools/NiViewer/NiViewer.vcxproj b/Source/Tools/NiViewer/NiViewer.vcxproj
|
1385 |
+
index 0a4c392..e331009 100644
|
1386 |
+
--- a/Source/Tools/NiViewer/NiViewer.vcxproj
|
1387 |
+
+++ b/Source/Tools/NiViewer/NiViewer.vcxproj
|
1388 |
+
@@ -2,4 +2,4 @@
|
1389 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1390 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1391 |
+
<ItemGroup Label="ProjectConfigurations">
|
1392 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1393 |
+
<Configuration>Debug</Configuration>
|
1394 |
+
@@ -27,23 +27,27 @@
|
1395 |
+
<ConfigurationType>Application</ConfigurationType>
|
1396 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1397 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1398 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1399 |
+
</PropertyGroup>
|
1400 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1401 |
+
<ConfigurationType>Application</ConfigurationType>
|
1402 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1403 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1404 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1405 |
+
</PropertyGroup>
|
1406 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
1407 |
+
<ConfigurationType>Application</ConfigurationType>
|
1408 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1409 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1410 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1411 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1412 |
+
</PropertyGroup>
|
1413 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1414 |
+
<ConfigurationType>Application</ConfigurationType>
|
1415 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1416 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1417 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1418 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1419 |
+
</PropertyGroup>
|
1420 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1421 |
+
<ImportGroup Label="ExtensionSettings">
|
1422 |
+
@@ -84,7 +88,7 @@
|
1423 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1424 |
+
<WarningLevel>Level4</WarningLevel>
|
1425 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1426 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1427 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1428 |
+
<MinimalRebuild>
|
1429 |
+
</MinimalRebuild>
|
1430 |
+
</ClCompile>
|
1431 |
+
@@ -105,7 +109,7 @@
|
1432 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
1433 |
+
<WarningLevel>Level4</WarningLevel>
|
1434 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1435 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1436 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1437 |
+
<MinimalRebuild>
|
1438 |
+
</MinimalRebuild>
|
1439 |
+
</ClCompile>
|
1440 |
+
@@ -133,7 +137,7 @@
|
1441 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
1442 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1443 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
1444 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1445 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1446 |
+
</ClCompile>
|
1447 |
+
<Link>
|
1448 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
1449 |
+
@@ -142,6 +146,7 @@
|
1450 |
+
<AdditionalDependencies>Comdlg32.lib;OpenNI2.lib;XnLib.lib;glut32.lib</AdditionalDependencies>
|
1451 |
+
<AdditionalLibraryDirectories>$(OutDir);..\..\..\ThirdParty\GL</AdditionalLibraryDirectories>
|
1452 |
+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
|
1453 |
+
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
1454 |
+
</Link>
|
1455 |
+
<ResourceCompile>
|
1456 |
+
<AdditionalIncludeDirectories>..\..\..\Include</AdditionalIncludeDirectories>
|
1457 |
+
@@ -161,7 +166,7 @@
|
1458 |
+
<BufferSecurityCheck>false</BufferSecurityCheck>
|
1459 |
+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
1460 |
+
<FloatingPointModel>Fast</FloatingPointModel>
|
1461 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1462 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1463 |
+
</ClCompile>
|
1464 |
+
<Link>
|
1465 |
+
<GenerateDebugInformation>true</GenerateDebugInformation>
|
1466 |
+
diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
|
1467 |
+
index 2761222..f2094b3 100644
|
1468 |
+
--- a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
|
1469 |
+
+++ b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
|
1470 |
+
@@ -2,4 +2,4 @@
|
1471 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1472 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1473 |
+
<ItemGroup Label="ProjectConfigurations">
|
1474 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1475 |
+
<Configuration>Debug</Configuration>
|
1476 |
+
@@ -116,23 +116,27 @@
|
1477 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
1478 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1479 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1480 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1481 |
+
</PropertyGroup>
|
1482 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
1483 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
1484 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1485 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1486 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1487 |
+
</PropertyGroup>
|
1488 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
1489 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
1490 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1491 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1492 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1493 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1494 |
+
</PropertyGroup>
|
1495 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
1496 |
+
<ConfigurationType>StaticLibrary</ConfigurationType>
|
1497 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1498 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1499 |
+
<CharacterSet>MultiByte</CharacterSet>
|
1500 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1501 |
+
</PropertyGroup>
|
1502 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1503 |
+
<ImportGroup Label="ExtensionSettings">
|
1504 |
+
@@ -176,7 +180,7 @@
|
1505 |
+
<AdditionalIncludeDirectories>..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
1506 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT</PreprocessorDefinitions>
|
1507 |
+
<WarningLevel>Level4</WarningLevel>
|
1508 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1509 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1510 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1511 |
+
<MinimalRebuild>
|
1512 |
+
</MinimalRebuild>
|
1513 |
+
@@ -198,7 +202,7 @@
|
1514 |
+
<AdditionalIncludeDirectories>..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
1515 |
+
<PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT</PreprocessorDefinitions>
|
1516 |
+
<WarningLevel>Level4</WarningLevel>
|
1517 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1518 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1519 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1520 |
+
<MinimalRebuild>
|
1521 |
+
</MinimalRebuild>
|
1522 |
+
@@ -220,7 +224,7 @@
|
1523 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1524 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);XnLib_EXPORT</PreprocessorDefinitions>
|
1525 |
+
<AdditionalIncludeDirectories>..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
1526 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1527 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1528 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1529 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1530 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1531 |
+
@@ -248,7 +252,7 @@
|
1532 |
+
<IntrinsicFunctions>true</IntrinsicFunctions>
|
1533 |
+
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);XnLib_EXPORT</PreprocessorDefinitions>
|
1534 |
+
<AdditionalIncludeDirectories>..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
1535 |
+
- <TreatWarningAsError>true</TreatWarningAsError>
|
1536 |
+
+ <TreatWarningAsError>false</TreatWarningAsError>
|
1537 |
+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
1538 |
+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
1539 |
+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
1540 |
+
diff --git a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
|
1541 |
+
index b95c484..bfd0503 100644
|
1542 |
+
--- a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
|
1543 |
+
+++ b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
|
1544 |
+
@@ -2,4 +2,4 @@
|
1545 |
+
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1546 |
+
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
1547 |
+
<ItemGroup Label="ProjectConfigurations">
|
1548 |
+
<ProjectConfiguration Include="Debug|Win32">
|
1549 |
+
<Configuration>Debug</Configuration>
|
1550 |
+
@@ -28,18 +28,22 @@
|
1551 |
+
<UseDebugLibraries>true</UseDebugLibraries>
|
1552 |
+
<CharacterSet>Unicode</CharacterSet>
|
1553 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1554 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1555 |
+
</PropertyGroup>
|
1556 |
+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
1557 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1558 |
+
<UseDebugLibraries>false</UseDebugLibraries>
|
1559 |
+
<WholeProgramOptimization>true</WholeProgramOptimization>
|
1560 |
+
<CharacterSet>Unicode</CharacterSet>
|
1561 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1562 |
+
</PropertyGroup>
|
1563 |
+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
1564 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1565 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1566 |
+
</PropertyGroup>
|
1567 |
+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
1568 |
+
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
1569 |
+
+ <PlatformToolset>v141</PlatformToolset>
|
1570 |
+
</PropertyGroup>
|
1571 |
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
1572 |
+
<ImportGroup Label="ExtensionSettings">
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openni2/vcpkg.json
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openni2",
|
3 |
+
"version-string": "2.2.0.33",
|
4 |
+
"port-version": 13,
|
5 |
+
"description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.",
|
6 |
+
"homepage": "https://github.com/OpenNI/OpenNI2",
|
7 |
+
"supports": "!uwp",
|
8 |
+
"dependencies": [
|
9 |
+
"kinectsdk1"
|
10 |
+
]
|
11 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/fix-build.patch
ADDED
@@ -0,0 +1,121 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 4de5b57..5f483a3 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -140,15 +140,25 @@ find_package(SWIG)
|
6 |
+
find_package(LibXml2 REQUIRED)
|
7 |
+
find_package(LibXslt REQUIRED)
|
8 |
+
find_package(BZip2)
|
9 |
+
+find_package(OpenSSL REQUIRED)
|
10 |
+
+find_package(ZLIB REQUIRED)
|
11 |
+
|
12 |
+
# PThread
|
13 |
+
-set(CMAKE_THREAD_PREFER_PTHREAD)
|
14 |
+
-set(THREADS_PREFER_PTHREAD_FLAG)
|
15 |
+
-set(THREADS_USE_PTHREADS_WIN32 true)
|
16 |
+
-find_package(Threads REQUIRED)
|
17 |
+
-check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
|
18 |
+
-check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
|
19 |
+
-check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)
|
20 |
+
+if (WIN32)
|
21 |
+
+ set(CMAKE_THREAD_PREFER_PTHREAD)
|
22 |
+
+ set(THREADS_PREFER_PTHREAD_FLAG)
|
23 |
+
+ set(THREADS_USE_PTHREADS_WIN32 true)
|
24 |
+
+ find_package(pthread CONFIG REQUIRED)
|
25 |
+
+ set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY})
|
26 |
+
+ check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
|
27 |
+
+ check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
|
28 |
+
+ check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)
|
29 |
+
+else()
|
30 |
+
+ set(THREADS_USE_PTHREADS_WIN32 -pthread)
|
31 |
+
+endif()
|
32 |
+
+
|
33 |
+
+# OpenSSL
|
34 |
+
+link_libraries(OpenSSL::SSL OpenSSL::Crypto)
|
35 |
+
|
36 |
+
# WITH_CRYPTO
|
37 |
+
set(WITH_CRYPTO "gcrypt" CACHE STRING "gcrypt|nss3")
|
38 |
+
@@ -373,19 +383,9 @@ message(STATUS "asciidoc: ${ASCIIDOC_EXECUTABLE}")
|
39 |
+
|
40 |
+
# ---------- PATHS
|
41 |
+
|
42 |
+
-if(WIN32)
|
43 |
+
- # Windows installer does not allow full paths.
|
44 |
+
- # The install path can be changed by user in Windows installer.
|
45 |
+
- # We will use relative names - "schemas", "xsl" and "cpe"
|
46 |
+
- # directories will be located in the same directory as oscap.exe.
|
47 |
+
- set(OSCAP_DEFAULT_SCHEMA_PATH "schemas")
|
48 |
+
- set(OSCAP_DEFAULT_XSLT_PATH "xsl")
|
49 |
+
- set(OSCAP_DEFAULT_CPE_PATH "cpe")
|
50 |
+
-else()
|
51 |
+
- set(OSCAP_DEFAULT_SCHEMA_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/schemas")
|
52 |
+
- set(OSCAP_DEFAULT_XSLT_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/xsl")
|
53 |
+
- set(OSCAP_DEFAULT_CPE_PATH "${CMAKE_INSTALL_FULL_DATADIR}/openscap/cpe")
|
54 |
+
-endif()
|
55 |
+
+set(OSCAP_DEFAULT_SCHEMA_PATH share/openscap/schemas)
|
56 |
+
+set(OSCAP_DEFAULT_XSLT_PATH share/openscap/xsl)
|
57 |
+
+set(OSCAP_DEFAULT_CPE_PATH share/openscap/cpe)
|
58 |
+
set(OSCAP_TEMP_DIR "/tmp" CACHE STRING "use different temporary directory to execute sce scripts (default=/tmp)")
|
59 |
+
|
60 |
+
# ---------- RPATHS for linking
|
61 |
+
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
|
62 |
+
index 2a3f373..781d05a 100644
|
63 |
+
--- a/utils/CMakeLists.txt
|
64 |
+
+++ b/utils/CMakeLists.txt
|
65 |
+
@@ -6,27 +6,32 @@ if(ENABLE_OSCAP_UTIL)
|
66 |
+
add_executable(oscap ${UTILS_SOURCES})
|
67 |
+
target_link_libraries(oscap openscap)
|
68 |
+
if(WIN32)
|
69 |
+
- set(OSCAP_UTIL_DESTINATION ".")
|
70 |
+
+ find_path(GETOPT_INCLUDE_DIR getopt.h)
|
71 |
+
+ include(SelectLibraryConfigurations)
|
72 |
+
+ find_library(GETOPT_LIBRARY_RELEASE NAMES getopt)
|
73 |
+
+ find_library(GETOPT_LIBRARY_DEBUG NAMES getopt PATH_SUFFIXES debug/lib)
|
74 |
+
+ select_library_configurations(GETOPT)
|
75 |
+
+
|
76 |
+
+ message("GETOPT_INCLUDE_DIR: ${GETOPT_INCLUDE_DIR}")
|
77 |
+
+ message("GETOPT_LIBRARY: ${GETOPT_LIBRARY}")
|
78 |
+
+
|
79 |
+
+ target_include_directories(oscap PRIVATE ${GETOPT_INCLUDE_DIR})
|
80 |
+
+ target_link_libraries(oscap PRIVATE ${GETOPT_LIBRARY})
|
81 |
+
+
|
82 |
+
+ set(OSCAP_UTIL_DESTINATION tools)
|
83 |
+
# Install the 'oscap' utility
|
84 |
+
install(TARGETS "oscap"
|
85 |
+
DESTINATION ${OSCAP_UTIL_DESTINATION}
|
86 |
+
)
|
87 |
+
- # Install all recursively dependent DLLs for oscap.exe
|
88 |
+
- set(APPS "\${CMAKE_INSTALL_PREFIX}/oscap.exe") # the \ before $ is required by BundleUtilities
|
89 |
+
- set(VCPKG_DLL_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin")
|
90 |
+
- install(CODE "
|
91 |
+
- include(BundleUtilities)
|
92 |
+
- fixup_bundle(\"${APPS}\" \"\" \"${VCPKG_DLL_DIR}\")
|
93 |
+
- ")
|
94 |
+
else()
|
95 |
+
- set(OSCAP_UTIL_DESTINATION ${CMAKE_INSTALL_BINDIR})
|
96 |
+
+ set(OSCAP_UTIL_DESTINATION tools)
|
97 |
+
# Install the 'oscap' utility
|
98 |
+
install(TARGETS "oscap"
|
99 |
+
DESTINATION ${OSCAP_UTIL_DESTINATION}
|
100 |
+
)
|
101 |
+
# Install manual page
|
102 |
+
install(FILES "oscap.8"
|
103 |
+
- DESTINATION "${CMAKE_INSTALL_MANDIR}/man8"
|
104 |
+
+ DESTINATION share/openscap/man8
|
105 |
+
)
|
106 |
+
endif()
|
107 |
+
endif()
|
108 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
109 |
+
index 9e18613..e84a21f 100644
|
110 |
+
--- a/src/CMakeLists.txt
|
111 |
+
+++ b/src/CMakeLists.txt
|
112 |
+
@@ -125,4 +125,8 @@ else()
|
113 |
+
set(OPENSCAP_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
114 |
+
endif()
|
115 |
+
|
116 |
+
-install(TARGETS openscap DESTINATION ${OPENSCAP_INSTALL_DESTINATION})
|
117 |
+
+install(TARGETS openscap
|
118 |
+
+ RUNTIME DESTINATION bin
|
119 |
+
+ LIBRARY DESTINATION lib
|
120 |
+
+ ARCHIVE DESTINATION lib
|
121 |
+
+)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/portfile.cmake
ADDED
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO OpenSCAP/openscap
|
4 |
+
REF 3a4c635691380fa990a226acc8558db35d7ebabc #1.3.1
|
5 |
+
SHA512 12681d43b2ce067c5a5c4eb47e14d91d6e9362b1f98f1d35b05d79ad84c7ee8c29f438eaae8e8465033155e500bb0f936eb79af46fab15e4a07e03c6be8b655d
|
6 |
+
HEAD_REF dev
|
7 |
+
PATCHES
|
8 |
+
fix-build.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
if ("python" IN_LIST FEATURES)
|
12 |
+
vcpkg_find_acquire_program(PYTHON3)
|
13 |
+
endif()
|
14 |
+
|
15 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
16 |
+
docs ENABLE_DOCS
|
17 |
+
tests ENABLE_TESTS
|
18 |
+
util ENABLE_OSCAP_UTIL
|
19 |
+
python ENABLE_PYTHON3
|
20 |
+
)
|
21 |
+
|
22 |
+
vcpkg_configure_cmake(
|
23 |
+
SOURCE_PATH ${SOURCE_PATH}
|
24 |
+
PREFER_NINJA
|
25 |
+
OPTIONS ${FEATURE_OPTIONS}
|
26 |
+
-DPYTHON_EXECUTABLE=${PYTHON3}
|
27 |
+
-DENABLE_PERL=OFF
|
28 |
+
-DENABLE_MITRE=OFF
|
29 |
+
-DENABLE_VALGRIND=OFF
|
30 |
+
-DENABLE_OSCAP_UTIL_DOCKER=OFF
|
31 |
+
-DENABLE_OSCAP_UTIL_AS_RPM=OFF
|
32 |
+
-DENABLE_OSCAP_UTIL_SSH=OFF
|
33 |
+
-DENABLE_OSCAP_UTIL_VM=OFF
|
34 |
+
-DENABLE_OSCAP_UTIL_PODMAN=OFF
|
35 |
+
-DENABLE_OSCAP_UTIL_CHROOT=OFF
|
36 |
+
)
|
37 |
+
|
38 |
+
vcpkg_install_cmake()
|
39 |
+
|
40 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
41 |
+
|
42 |
+
vcpkg_copy_pdbs()
|
43 |
+
|
44 |
+
#Handle copyright
|
45 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openscap/vcpkg.json
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openscap",
|
3 |
+
"version-string": "1.3.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.",
|
6 |
+
"homepage": "https://github.com/OpenSCAP/openscap",
|
7 |
+
"dependencies": [
|
8 |
+
"curl",
|
9 |
+
"glib",
|
10 |
+
"libpopt",
|
11 |
+
"libxml2",
|
12 |
+
"libxslt",
|
13 |
+
"libzip",
|
14 |
+
"openssl",
|
15 |
+
"pcre2",
|
16 |
+
"pthread",
|
17 |
+
"zlib"
|
18 |
+
],
|
19 |
+
"features": {
|
20 |
+
"docs": {
|
21 |
+
"description": "install docs"
|
22 |
+
},
|
23 |
+
"python": {
|
24 |
+
"description": "build with python3"
|
25 |
+
},
|
26 |
+
"tests": {
|
27 |
+
"description": "build with tests"
|
28 |
+
},
|
29 |
+
"util": {
|
30 |
+
"description": "build available utils",
|
31 |
+
"dependencies": [
|
32 |
+
{
|
33 |
+
"name": "getopt-win32",
|
34 |
+
"platform": "windows"
|
35 |
+
}
|
36 |
+
]
|
37 |
+
}
|
38 |
+
}
|
39 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-unix/portfile.cmake
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-unix/vcpkg.json
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openssl-unix",
|
3 |
+
"version-string": "1.1.1h",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Deprecated OpenSSL port",
|
6 |
+
"supports": "!(windows | uwp)",
|
7 |
+
"dependencies": [
|
8 |
+
"openssl"
|
9 |
+
]
|
10 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-uwp/portfile.cmake
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-uwp/vcpkg.json
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openssl-uwp",
|
3 |
+
"version-string": "1.1.1h",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Deprecated OpenSSL port",
|
6 |
+
"supports": "uwp",
|
7 |
+
"dependencies": [
|
8 |
+
"openssl"
|
9 |
+
]
|
10 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-windows/portfile.cmake
ADDED
@@ -0,0 +1 @@
|
|
|
|
|
1 |
+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl-windows/vcpkg.json
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openssl-windows",
|
3 |
+
"version-string": "1.1.1h",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Deprecated OpenSSL port",
|
6 |
+
"supports": "windows",
|
7 |
+
"dependencies": [
|
8 |
+
"openssl"
|
9 |
+
]
|
10 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/install-pc-files.cmake
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
function(install_pc_file name pc_data)
|
2 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
3 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
|
4 |
+
endif()
|
5 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
6 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
|
7 |
+
endif()
|
8 |
+
endfunction()
|
9 |
+
|
10 |
+
install_pc_file(openssl [[
|
11 |
+
Name: OpenSSL
|
12 |
+
Description: Secure Sockets Layer and cryptography libraries and tools
|
13 |
+
Requires: libssl libcrypto
|
14 |
+
]])
|
15 |
+
|
16 |
+
install_pc_file(libssl [[
|
17 |
+
Name: OpenSSL-libssl
|
18 |
+
Description: Secure Sockets Layer and cryptography libraries
|
19 |
+
Libs: -L"${libdir}" -llibssl
|
20 |
+
Requires: libcrypto
|
21 |
+
Cflags: -I"${includedir}"
|
22 |
+
]])
|
23 |
+
|
24 |
+
install_pc_file(libcrypto [[
|
25 |
+
Name: OpenSSL-libcrypto
|
26 |
+
Description: OpenSSL cryptography library
|
27 |
+
Libs: -L"${libdir}" -llibcrypto
|
28 |
+
Libs.private: -lcrypt32 -lws2_32
|
29 |
+
Cflags: -I"${includedir}"
|
30 |
+
]])
|
31 |
+
|
32 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/openssl.pc.in
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
prefix=${pcfiledir}/../..
|
2 |
+
exec_prefix=${prefix}
|
3 |
+
libdir=${exec_prefix}/lib
|
4 |
+
includedir=${prefix}/include
|
5 |
+
Version: @OPENSSL_VERSION@
|
6 |
+
@pc_data@
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/portfile.cmake
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright"
|
2 |
+
OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright")
|
3 |
+
message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
|
4 |
+
endif()
|
5 |
+
|
6 |
+
if (VCPKG_TARGET_IS_LINUX)
|
7 |
+
message(WARNING
|
8 |
+
[[openssl currently requires the following library from the system package manager:
|
9 |
+
linux-headers
|
10 |
+
It can be installed on alpine systems via apk add linux-headers.]]
|
11 |
+
)
|
12 |
+
endif()
|
13 |
+
|
14 |
+
set(OPENSSL_VERSION 3.0.2)
|
15 |
+
|
16 |
+
vcpkg_download_distfile(
|
17 |
+
ARCHIVE
|
18 |
+
URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz"
|
19 |
+
FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
|
20 |
+
SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_find_acquire_program(PERL)
|
24 |
+
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
|
25 |
+
vcpkg_add_to_path("${PERL_EXE_PATH}")
|
26 |
+
|
27 |
+
if(VCPKG_TARGET_IS_UWP)
|
28 |
+
include("${CMAKE_CURRENT_LIST_DIR}/uwp/portfile.cmake")
|
29 |
+
include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
|
30 |
+
elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
31 |
+
include("${CMAKE_CURRENT_LIST_DIR}/windows/portfile.cmake")
|
32 |
+
include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
|
33 |
+
else()
|
34 |
+
include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake")
|
35 |
+
endif()
|
36 |
+
|
37 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
38 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/CMakeLists.txt
ADDED
@@ -0,0 +1,285 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.9)
|
2 |
+
project(openssl C)
|
3 |
+
|
4 |
+
if(NOT SOURCE_PATH)
|
5 |
+
message(FATAL_ERROR "Requires SOURCE_PATH")
|
6 |
+
endif()
|
7 |
+
|
8 |
+
if(CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
9 |
+
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
10 |
+
set(PLATFORM linux-x86_64)
|
11 |
+
else()
|
12 |
+
set(PLATFORM linux-generic32)
|
13 |
+
endif()
|
14 |
+
elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
15 |
+
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
|
16 |
+
set(PLATFORM ios64-xcrun)
|
17 |
+
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
|
18 |
+
set(PLATFORM ios-xcrun)
|
19 |
+
elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR
|
20 |
+
VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
|
21 |
+
set(PLATFORM iossimulator-xcrun)
|
22 |
+
else()
|
23 |
+
message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
24 |
+
endif()
|
25 |
+
# disable that makes linkage error (e.g. require stderr usage)
|
26 |
+
list(APPEND DISABLES no-stdio no-ui no-asm)
|
27 |
+
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
28 |
+
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
|
29 |
+
set(PLATFORM darwin64-arm64-cc)
|
30 |
+
else()
|
31 |
+
set(PLATFORM darwin64-x86_64-cc)
|
32 |
+
endif()
|
33 |
+
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
34 |
+
set(PLATFORM BSD-generic64)
|
35 |
+
elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
|
36 |
+
set(PLATFORM BSD-generic64)
|
37 |
+
elseif(MINGW)
|
38 |
+
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
39 |
+
set(PLATFORM mingw64)
|
40 |
+
else()
|
41 |
+
set(PLATFORM mingw)
|
42 |
+
endif()
|
43 |
+
elseif(EMSCRIPTEN)
|
44 |
+
set(MAKE $ENV{EMSDK}/upstream/emscripten/emmake)
|
45 |
+
set(ENV{MAKE} $ENV{EMSDK}/upstream/emscripten/emmake)
|
46 |
+
else()
|
47 |
+
message(FATAL_ERROR "Unknown platform")
|
48 |
+
endif()
|
49 |
+
|
50 |
+
get_filename_component(COMPILER_ROOT "${CMAKE_C_COMPILER}" DIRECTORY)
|
51 |
+
|
52 |
+
message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
|
53 |
+
message("COMPILER_ROOT=${COMPILER_ROOT}")
|
54 |
+
message("CMAKE_SYSROOT=${CMAKE_SYSROOT}")
|
55 |
+
message("CMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}")
|
56 |
+
message("CMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
57 |
+
message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}")
|
58 |
+
message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}")
|
59 |
+
message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}")
|
60 |
+
message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}")
|
61 |
+
message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}")
|
62 |
+
|
63 |
+
string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
|
64 |
+
set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}")
|
65 |
+
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
|
66 |
+
set(CFLAGS "${CFLAGS} -Wno-error=unused-command-line-argument")
|
67 |
+
endif()
|
68 |
+
if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET)
|
69 |
+
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}")
|
70 |
+
endif()
|
71 |
+
if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN AND CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN)
|
72 |
+
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
|
73 |
+
endif()
|
74 |
+
if(CMAKE_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
|
75 |
+
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
|
76 |
+
elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT)
|
77 |
+
set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}")
|
78 |
+
endif()
|
79 |
+
if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
|
80 |
+
set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
|
81 |
+
elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64"))
|
82 |
+
set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0")
|
83 |
+
endif()
|
84 |
+
|
85 |
+
string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
|
86 |
+
|
87 |
+
if(CMAKE_HOST_WIN32)
|
88 |
+
file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}")
|
89 |
+
else()
|
90 |
+
file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}")
|
91 |
+
endif()
|
92 |
+
set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr")
|
93 |
+
|
94 |
+
if(NOT IOS)
|
95 |
+
set(ENV{CC} "${CMAKE_C_COMPILER}")
|
96 |
+
endif()
|
97 |
+
|
98 |
+
message("ENV{ANDROID_DEV}=$ENV{ANDROID_DEV}")
|
99 |
+
|
100 |
+
get_filename_component(SOURCE_PATH_NAME "${SOURCE_PATH}" NAME)
|
101 |
+
set(BUILDDIR "${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_PATH_NAME}")
|
102 |
+
|
103 |
+
if(NOT EXISTS "${BUILDDIR}")
|
104 |
+
file(COPY ${SOURCE_PATH} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
105 |
+
endif()
|
106 |
+
|
107 |
+
get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY)
|
108 |
+
|
109 |
+
if(BUILD_SHARED_LIBS)
|
110 |
+
set(SHARED shared)
|
111 |
+
file(STRINGS "${BUILDDIR}/VERSION.dat" SHLIB_VERSION
|
112 |
+
REGEX "^SHLIB_VERSION=.*")
|
113 |
+
string(REGEX REPLACE "^(SHLIB_VERSION=)(.*)$" "\\2"
|
114 |
+
SHLIB_VERSION "${SHLIB_VERSION}")
|
115 |
+
|
116 |
+
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
117 |
+
set(LIB_EXT dylib)
|
118 |
+
set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT})
|
119 |
+
elseif(MINGW)
|
120 |
+
string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}")
|
121 |
+
set(BIN_EXT dll)
|
122 |
+
set(LIB_EXT dll.a)
|
123 |
+
else()
|
124 |
+
set(LIB_EXT so)
|
125 |
+
set(LIB_EXTS ${LIB_EXT}.${SHLIB_VERSION})
|
126 |
+
endif()
|
127 |
+
list(APPEND BIN_EXTS ${BIN_EXT})
|
128 |
+
list(APPEND LIB_EXTS ${LIB_EXT})
|
129 |
+
else()
|
130 |
+
set(SHARED no-shared)
|
131 |
+
set(LIB_EXTS a)
|
132 |
+
endif()
|
133 |
+
set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc")
|
134 |
+
foreach(lib ssl crypto)
|
135 |
+
foreach(ext ${LIB_EXTS})
|
136 |
+
list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}")
|
137 |
+
list(APPEND INSTALL_PKG_CONFIGS "${BUILDDIR}/lib${lib}.pc")
|
138 |
+
endforeach()
|
139 |
+
foreach(ext ${BIN_EXTS})
|
140 |
+
# This might be wrong for targets which don't follow this naming scheme, but I'm not aware of any
|
141 |
+
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
142 |
+
list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}-x64.${ext}")
|
143 |
+
else()
|
144 |
+
list(APPEND INSTALL_BINS "${BUILDDIR}/lib${lib}-${SHLIB_VERSION}.${ext}")
|
145 |
+
endif()
|
146 |
+
endforeach()
|
147 |
+
endforeach()
|
148 |
+
|
149 |
+
if(CMAKE_HOST_WIN32)
|
150 |
+
set(ENV_COMMAND set)
|
151 |
+
set(PATH_VAR ";%PATH%")
|
152 |
+
else()
|
153 |
+
set(ENV_COMMAND export)
|
154 |
+
set(PATH_VAR ":$ENV{PATH}")
|
155 |
+
endif()
|
156 |
+
|
157 |
+
add_custom_command(
|
158 |
+
OUTPUT "${BUILDDIR}/Makefile"
|
159 |
+
COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
|
160 |
+
VERBATIM
|
161 |
+
WORKING_DIRECTORY "${BUILDDIR}"
|
162 |
+
)
|
163 |
+
|
164 |
+
if(NOT IOS)
|
165 |
+
add_custom_command(
|
166 |
+
OUTPUT "${BUILDDIR}/Makefile"
|
167 |
+
COMMAND ${ENV_COMMAND} CC=${CMAKE_C_COMPILER}
|
168 |
+
COMMAND ${ENV_COMMAND} AR=${CMAKE_AR}
|
169 |
+
COMMAND ${ENV_COMMAND} LD=${CMAKE_LINKER}
|
170 |
+
COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB}
|
171 |
+
COMMAND ${ENV_COMMAND} MAKE=${MAKE}
|
172 |
+
COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER}
|
173 |
+
COMMAND ${ENV_COMMAND} WINDRES=${CMAKE_RC_COMPILER}
|
174 |
+
VERBATIM
|
175 |
+
APPEND
|
176 |
+
)
|
177 |
+
if(EMSCRIPTEN)
|
178 |
+
list(APPEND DISABLES
|
179 |
+
threads
|
180 |
+
no-engine
|
181 |
+
no-dso
|
182 |
+
no-asm
|
183 |
+
no-shared
|
184 |
+
no-sse2
|
185 |
+
no-srtp
|
186 |
+
)
|
187 |
+
else()
|
188 |
+
list(APPEND DISABLES
|
189 |
+
enable-static-engine
|
190 |
+
no-zlib
|
191 |
+
no-ssl2
|
192 |
+
no-idea
|
193 |
+
no-cast
|
194 |
+
no-seed
|
195 |
+
no-md2
|
196 |
+
no-tests)
|
197 |
+
endif()
|
198 |
+
endif()
|
199 |
+
|
200 |
+
if(EMSCRIPTEN)
|
201 |
+
add_custom_command(
|
202 |
+
OUTPUT "${BUILDDIR}/Makefile"
|
203 |
+
COMMAND "$ENV{EMSDK}/upstream/emscripten/emconfigure" ./config
|
204 |
+
${SHARED}
|
205 |
+
${DISABLES}
|
206 |
+
"--prefix=${CMAKE_INSTALL_PREFIX}"
|
207 |
+
"--openssldir=/etc/ssl"
|
208 |
+
"--cross-compile-prefix=\"/\""
|
209 |
+
VERBATIM
|
210 |
+
APPEND
|
211 |
+
)
|
212 |
+
|
213 |
+
add_custom_target(build_libs ALL
|
214 |
+
COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
|
215 |
+
COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
|
216 |
+
COMMAND "${MAKE}" make build_libs
|
217 |
+
VERBATIM
|
218 |
+
WORKING_DIRECTORY "${BUILDDIR}"
|
219 |
+
DEPENDS "${BUILDDIR}/Makefile"
|
220 |
+
BYPRODUCTS ${INSTALL_LIBS}
|
221 |
+
)
|
222 |
+
else()
|
223 |
+
add_custom_command(
|
224 |
+
OUTPUT "${BUILDDIR}/Makefile"
|
225 |
+
COMMAND "${PERL}" Configure
|
226 |
+
${SHARED}
|
227 |
+
${DISABLES}
|
228 |
+
${PLATFORM}
|
229 |
+
"--prefix=${CMAKE_INSTALL_PREFIX}"
|
230 |
+
"--openssldir=/etc/ssl"
|
231 |
+
${CFLAGS}
|
232 |
+
VERBATIM
|
233 |
+
APPEND
|
234 |
+
)
|
235 |
+
|
236 |
+
add_custom_target(build_libs ALL
|
237 |
+
COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
|
238 |
+
COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
|
239 |
+
COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
|
240 |
+
VERBATIM
|
241 |
+
WORKING_DIRECTORY "${BUILDDIR}"
|
242 |
+
DEPENDS "${BUILDDIR}/Makefile"
|
243 |
+
BYPRODUCTS ${INSTALL_LIBS}
|
244 |
+
)
|
245 |
+
endif()
|
246 |
+
|
247 |
+
add_custom_command(
|
248 |
+
OUTPUT "${BUILDDIR}/Makefile"
|
249 |
+
COMMAND "${CMAKE_COMMAND}" "-DDIR=${BUILDDIR}" -P "${CMAKE_CURRENT_LIST_DIR}/remove-deps.cmake"
|
250 |
+
VERBATIM
|
251 |
+
APPEND
|
252 |
+
)
|
253 |
+
|
254 |
+
if((CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") AND BUILD_SHARED_LIBS)
|
255 |
+
if(DEFINED CMAKE_INSTALL_NAME_DIR)
|
256 |
+
set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}")
|
257 |
+
else()
|
258 |
+
set(ID_PREFIX "@rpath")
|
259 |
+
endif()
|
260 |
+
|
261 |
+
add_custom_command(
|
262 |
+
TARGET build_libs
|
263 |
+
COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libssl.${SHLIB_VERSION}.dylib"
|
264 |
+
"${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
|
265 |
+
COMMAND /usr/bin/install_name_tool -id "${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
|
266 |
+
"${BUILDDIR}/libcrypto.1.1.dylib"
|
267 |
+
COMMAND /usr/bin/install_name_tool -change "${CMAKE_INSTALL_PREFIX}/lib/libcrypto.${SHLIB_VERSION}.dylib"
|
268 |
+
"${ID_PREFIX}/libcrypto.${SHLIB_VERSION}.dylib"
|
269 |
+
"${BUILDDIR}/libssl.${SHLIB_VERSION}.dylib"
|
270 |
+
VERBATIM
|
271 |
+
)
|
272 |
+
endif()
|
273 |
+
|
274 |
+
install(
|
275 |
+
FILES ${INSTALL_LIBS}
|
276 |
+
DESTINATION lib
|
277 |
+
)
|
278 |
+
install(
|
279 |
+
FILES ${INSTALL_BINS}
|
280 |
+
DESTINATION bin
|
281 |
+
)
|
282 |
+
install(
|
283 |
+
FILES ${INSTALL_PKG_CONFIGS}
|
284 |
+
DESTINATION lib/pkgconfig
|
285 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/portfile.cmake
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_extract_source_archive_ex(
|
2 |
+
OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH
|
3 |
+
ARCHIVE "${ARCHIVE}"
|
4 |
+
REF ${OPENSSL_VERSION}
|
5 |
+
)
|
6 |
+
|
7 |
+
if(CMAKE_HOST_WIN32)
|
8 |
+
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
|
9 |
+
set(MAKE "${MSYS_ROOT}/usr/bin/make.exe")
|
10 |
+
set(PERL "${MSYS_ROOT}/usr/bin/perl.exe")
|
11 |
+
else()
|
12 |
+
find_program(MAKE make)
|
13 |
+
if(NOT MAKE)
|
14 |
+
message(FATAL_ERROR "Could not find make. Please install it through your package manager.")
|
15 |
+
endif()
|
16 |
+
endif()
|
17 |
+
|
18 |
+
vcpkg_cmake_configure(
|
19 |
+
SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}"
|
20 |
+
OPTIONS
|
21 |
+
-DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH}
|
22 |
+
-DPERL=${PERL}
|
23 |
+
-DMAKE=${MAKE}
|
24 |
+
-DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY}
|
25 |
+
)
|
26 |
+
|
27 |
+
vcpkg_cmake_install()
|
28 |
+
vcpkg_fixup_pkgconfig()
|
29 |
+
|
30 |
+
file(GLOB HEADERS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h")
|
31 |
+
set(RESOLVED_HEADERS)
|
32 |
+
foreach(HEADER ${HEADERS})
|
33 |
+
get_filename_component(X "${HEADER}" REALPATH)
|
34 |
+
list(APPEND RESOLVED_HEADERS "${X}")
|
35 |
+
endforeach()
|
36 |
+
|
37 |
+
file(INSTALL ${RESOLVED_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/openssl")
|
38 |
+
file(INSTALL "${MASTER_COPY_SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/unix/remove-deps.cmake
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
file(GLOB_RECURSE MAKEFILES ${DIR}/*/Makefile)
|
2 |
+
foreach(MAKEFILE ${MAKEFILES})
|
3 |
+
message("removing deps from ${MAKEFILE}")
|
4 |
+
file(READ "${MAKEFILE}" _contents)
|
5 |
+
string(REGEX REPLACE "\n# DO NOT DELETE THIS LINE.*" "" _contents "${_contents}")
|
6 |
+
file(WRITE "${MAKEFILE}" "${_contents}")
|
7 |
+
endforeach()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package openssl is compatible with built-in CMake targets:
|
2 |
+
|
3 |
+
find_package(OpenSSL REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE OpenSSL::SSL OpenSSL::Crypto)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/uwp/make-openssl.bat
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set build=%1
|
2 |
+
|
3 |
+
perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL -FS -FIWindows.h
|
4 |
+
|
5 |
+
for /D %%f in ("%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\*") do set LibPath=%LibPath%;%%f\
|
6 |
+
for /D %%f in ("%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\*") do set LibPath=%LibPath%;%%f\
|
7 |
+
for /D %%f in ("%WindowsSdkDir%References\Windows.Foundation.FoundationContract\*") do set LibPath=%LibPath%;%%f\
|
8 |
+
for /D %%f in ("%WindowsSdkDir%References\Windows.Foundation.UniversalApiContract\*") do set LibPath=%LibPath%;%%f\
|
9 |
+
|
10 |
+
call ms\do_winuniversal.bat
|
11 |
+
|
12 |
+
mkdir inc32\openssl
|
13 |
+
|
14 |
+
jom -j %NUMBER_OF_PROCESSORS% -k -f ms\ntdll.mak
|
15 |
+
REM due to a race condition in the build, we need to have a second single-threaded pass.
|
16 |
+
nmake -f ms\ntdll.mak
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/uwp/portfile.cmake
ADDED
@@ -0,0 +1,160 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_find_acquire_program(JOM)
|
2 |
+
get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
|
3 |
+
vcpkg_add_to_path("${PERL_EXE_PATH}")
|
4 |
+
|
5 |
+
set(OPENSSL_SHARED no-shared)
|
6 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
7 |
+
set(OPENSSL_SHARED shared)
|
8 |
+
endif()
|
9 |
+
|
10 |
+
vcpkg_extract_source_archive_ex(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
ARCHIVE ${ARCHIVE}
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_find_acquire_program(NASM)
|
16 |
+
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
|
17 |
+
vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
|
18 |
+
|
19 |
+
set(CONFIGURE_COMMAND ${PERL} Configure
|
20 |
+
enable-static-engine
|
21 |
+
enable-capieng
|
22 |
+
no-unit-test
|
23 |
+
no-ssl2
|
24 |
+
no-asm
|
25 |
+
no-uplink
|
26 |
+
no-tests
|
27 |
+
-utf-8
|
28 |
+
${OPENSSL_SHARED}
|
29 |
+
)
|
30 |
+
|
31 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
32 |
+
set(OPENSSL_ARCH VC-WIN32-UWP)
|
33 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
34 |
+
set(OPENSSL_ARCH VC-WIN64A-UWP)
|
35 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
36 |
+
set(OPENSSL_ARCH VC-WIN32-ARM-UWP)
|
37 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
38 |
+
set(OPENSSL_ARCH VC-WIN64-ARM-UWP)
|
39 |
+
else()
|
40 |
+
message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
41 |
+
endif()
|
42 |
+
|
43 |
+
set(OPENSSL_MAKEFILE "makefile")
|
44 |
+
|
45 |
+
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
46 |
+
|
47 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
48 |
+
|
49 |
+
# Copy openssl sources.
|
50 |
+
message(STATUS "Copying openssl release source files...")
|
51 |
+
file(GLOB OPENSSL_SOURCE_FILES "${SOURCE_PATH}/*")
|
52 |
+
foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES})
|
53 |
+
file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
54 |
+
endforeach()
|
55 |
+
message(STATUS "Copying openssl release source files... done")
|
56 |
+
set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
57 |
+
|
58 |
+
set(OPENSSLDIR_RELEASE "${CURRENT_PACKAGES_DIR}")
|
59 |
+
|
60 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-rel")
|
61 |
+
vcpkg_execute_required_process(
|
62 |
+
COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
|
63 |
+
WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
|
64 |
+
LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-rel
|
65 |
+
)
|
66 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
|
67 |
+
|
68 |
+
message(STATUS "Build ${TARGET_TRIPLET}-rel")
|
69 |
+
# Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
|
70 |
+
# This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
|
71 |
+
make_directory("${SOURCE_PATH_RELEASE}/inc32/openssl")
|
72 |
+
execute_process(
|
73 |
+
COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" build_libs
|
74 |
+
WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
|
75 |
+
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log"
|
76 |
+
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log"
|
77 |
+
)
|
78 |
+
vcpkg_execute_required_process(
|
79 |
+
COMMAND nmake -f "${OPENSSL_MAKEFILE}" install_dev
|
80 |
+
WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}"
|
81 |
+
LOGNAME build-${TARGET_TRIPLET}-rel-1)
|
82 |
+
|
83 |
+
message(STATUS "Build ${TARGET_TRIPLET}-rel done")
|
84 |
+
endif()
|
85 |
+
|
86 |
+
|
87 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
88 |
+
# Copy openssl sources.
|
89 |
+
message(STATUS "Copying openssl debug source files...")
|
90 |
+
file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*)
|
91 |
+
foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES})
|
92 |
+
file(COPY "${SOURCE_FILE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
93 |
+
endforeach()
|
94 |
+
message(STATUS "Copying openssl debug source files... done")
|
95 |
+
set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
96 |
+
|
97 |
+
set(OPENSSLDIR_DEBUG "${CURRENT_PACKAGES_DIR}/debug")
|
98 |
+
|
99 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-dbg")
|
100 |
+
vcpkg_execute_required_process(
|
101 |
+
COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
|
102 |
+
WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
|
103 |
+
LOGNAME configure-perl-${TARGET_TRIPLET}-${VCPKG_BUILD_TYPE}-dbg
|
104 |
+
)
|
105 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")
|
106 |
+
|
107 |
+
message(STATUS "Build ${TARGET_TRIPLET}-dbg")
|
108 |
+
make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl")
|
109 |
+
execute_process(
|
110 |
+
COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" build_libs
|
111 |
+
WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
|
112 |
+
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log"
|
113 |
+
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log"
|
114 |
+
)
|
115 |
+
vcpkg_execute_required_process(
|
116 |
+
COMMAND nmake -f "${OPENSSL_MAKEFILE}" install_dev
|
117 |
+
WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}"
|
118 |
+
LOGNAME build-${TARGET_TRIPLET}-dbg-1)
|
119 |
+
|
120 |
+
message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
|
121 |
+
endif()
|
122 |
+
|
123 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs")
|
124 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private")
|
125 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1")
|
126 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs")
|
127 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1")
|
128 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private")
|
129 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
130 |
+
|
131 |
+
file(REMOVE
|
132 |
+
"${CURRENT_PACKAGES_DIR}/bin/openssl.exe"
|
133 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe"
|
134 |
+
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf"
|
135 |
+
"${CURRENT_PACKAGES_DIR}/openssl.cnf"
|
136 |
+
"${CURRENT_PACKAGES_DIR}/ct_log_list.cnf"
|
137 |
+
"${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist"
|
138 |
+
"${CURRENT_PACKAGES_DIR}/openssl.cnf.dist"
|
139 |
+
"${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf"
|
140 |
+
"${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist"
|
141 |
+
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist"
|
142 |
+
)
|
143 |
+
|
144 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
145 |
+
# They should be empty, only the exes deleted above were in these directories
|
146 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/")
|
147 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/")
|
148 |
+
endif()
|
149 |
+
|
150 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents)
|
151 |
+
string(REPLACE "<winsock.h>" "<winsock2.h>" _contents "${_contents}")
|
152 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}")
|
153 |
+
|
154 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" _contents)
|
155 |
+
string(REPLACE "# include <windows.h>" "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n# include <windows.h>" _contents "${_contents}")
|
156 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}")
|
157 |
+
|
158 |
+
vcpkg_copy_pdbs()
|
159 |
+
|
160 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/vcpkg-cmake-wrapper.cmake.in
ADDED
@@ -0,0 +1,82 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_policy(PUSH)
|
2 |
+
cmake_policy(SET CMP0012 NEW)
|
3 |
+
cmake_policy(SET CMP0054 NEW)
|
4 |
+
cmake_policy(SET CMP0057 NEW)
|
5 |
+
|
6 |
+
set(OPENSSL_VERSION_MAJOR 3)
|
7 |
+
set(OPENSSL_VERSION_MINOR 0)
|
8 |
+
set(OPENSSL_VERSION_FIX 2)
|
9 |
+
|
10 |
+
if(OPENSSL_USE_STATIC_LIBS)
|
11 |
+
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic")
|
12 |
+
message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage")
|
13 |
+
endif()
|
14 |
+
set(OPENSSL_USE_STATIC_LIBS_BAK "${OPENSSL_USE_STATIC_LIBS}")
|
15 |
+
set(OPENSSL_USE_STATIC_LIBS FALSE)
|
16 |
+
endif()
|
17 |
+
|
18 |
+
if(DEFINED OPENSSL_ROOT_DIR)
|
19 |
+
set(OPENSSL_ROOT_DIR_BAK "${OPENSSL_ROOT_DIR}")
|
20 |
+
endif()
|
21 |
+
get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
|
22 |
+
get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" DIRECTORY)
|
23 |
+
find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATH "${OPENSSL_ROOT_DIR}/include" NO_DEFAULT_PATH)
|
24 |
+
if(MSVC)
|
25 |
+
find_library(LIB_EAY_DEBUG NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
|
26 |
+
find_library(LIB_EAY_RELEASE NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH)
|
27 |
+
find_library(SSL_EAY_DEBUG NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
|
28 |
+
find_library(SSL_EAY_RELEASE NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH)
|
29 |
+
elseif(WIN32)
|
30 |
+
find_library(LIB_EAY NAMES libcrypto crypto NAMES_PER_DIR)
|
31 |
+
find_library(SSL_EAY NAMES libssl ssl NAMES_PER_DIR)
|
32 |
+
else()
|
33 |
+
find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto)
|
34 |
+
find_library(OPENSSL_SSL_LIBRARY NAMES ssl)
|
35 |
+
endif()
|
36 |
+
|
37 |
+
_find_package(${ARGS})
|
38 |
+
|
39 |
+
unset(OPENSSL_ROOT_DIR)
|
40 |
+
if(DEFINED OPENSSL_ROOT_DIR_BAK)
|
41 |
+
set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR_BAK}")
|
42 |
+
unset(OPENSSL_ROOT_DIR_BAK)
|
43 |
+
endif()
|
44 |
+
|
45 |
+
if(DEFINED OPENSSL_USE_STATIC_LIBS_BAK)
|
46 |
+
set(OPENSSL_USE_STATIC_LIBS "${OPENSSL_USE_STATIC_LIBS_BAK}")
|
47 |
+
unset(OPENSSL_USE_STATIC_LIBS_BAK)
|
48 |
+
endif()
|
49 |
+
|
50 |
+
if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
51 |
+
if(WIN32)
|
52 |
+
list(APPEND OPENSSL_LIBRARIES crypt32 ws2_32)
|
53 |
+
if(TARGET OpenSSL::Crypto)
|
54 |
+
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32")
|
55 |
+
endif()
|
56 |
+
if(TARGET OpenSSL::SSL)
|
57 |
+
set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32")
|
58 |
+
endif()
|
59 |
+
else()
|
60 |
+
find_library(OPENSSL_DL_LIBRARY NAMES dl)
|
61 |
+
if(OPENSSL_DL_LIBRARY)
|
62 |
+
list(APPEND OPENSSL_LIBRARIES "dl")
|
63 |
+
if(TARGET OpenSSL::Crypto)
|
64 |
+
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
|
65 |
+
endif()
|
66 |
+
endif()
|
67 |
+
|
68 |
+
if("REQUIRED" IN_LIST ARGS)
|
69 |
+
find_package(Threads REQUIRED)
|
70 |
+
else()
|
71 |
+
find_package(Threads)
|
72 |
+
endif()
|
73 |
+
list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
|
74 |
+
if(TARGET OpenSSL::Crypto)
|
75 |
+
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
|
76 |
+
endif()
|
77 |
+
if(TARGET OpenSSL::SSL)
|
78 |
+
set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
|
79 |
+
endif()
|
80 |
+
endif()
|
81 |
+
endif()
|
82 |
+
cmake_policy(POP)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openssl",
|
3 |
+
"version": "3.0.2",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
|
6 |
+
"homepage": "https://www.openssl.org",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
]
|
18 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openssl/windows/portfile.cmake
ADDED
@@ -0,0 +1,185 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_extract_source_archive_ex(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
ARCHIVE ${ARCHIVE}
|
4 |
+
)
|
5 |
+
|
6 |
+
vcpkg_find_acquire_program(NASM)
|
7 |
+
get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
|
8 |
+
vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
|
9 |
+
|
10 |
+
vcpkg_find_acquire_program(JOM)
|
11 |
+
|
12 |
+
set(OPENSSL_SHARED no-shared)
|
13 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
14 |
+
set(OPENSSL_SHARED shared)
|
15 |
+
endif()
|
16 |
+
|
17 |
+
set(CONFIGURE_OPTIONS
|
18 |
+
enable-static-engine
|
19 |
+
enable-capieng
|
20 |
+
no-ssl2
|
21 |
+
no-tests
|
22 |
+
-utf-8
|
23 |
+
${OPENSSL_SHARED}
|
24 |
+
)
|
25 |
+
|
26 |
+
if(DEFINED OPENSSL_USE_NOPINSHARED)
|
27 |
+
set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared)
|
28 |
+
endif()
|
29 |
+
|
30 |
+
if(OPENSSL_NO_AUTOLOAD_CONFIG)
|
31 |
+
set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config)
|
32 |
+
endif()
|
33 |
+
|
34 |
+
set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS})
|
35 |
+
|
36 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
37 |
+
set(OPENSSL_ARCH VC-WIN32)
|
38 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
39 |
+
set(OPENSSL_ARCH VC-WIN64A)
|
40 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
41 |
+
set(OPENSSL_ARCH VC-WIN32-ARM)
|
42 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
43 |
+
set(OPENSSL_ARCH VC-WIN64-ARM)
|
44 |
+
else()
|
45 |
+
message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
46 |
+
endif()
|
47 |
+
|
48 |
+
set(OPENSSL_MAKEFILE "makefile")
|
49 |
+
|
50 |
+
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
|
51 |
+
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
52 |
+
|
53 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
54 |
+
|
55 |
+
# Copy openssl sources.
|
56 |
+
message(STATUS "Copying openssl release source files...")
|
57 |
+
file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*)
|
58 |
+
foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES})
|
59 |
+
file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
60 |
+
endforeach()
|
61 |
+
message(STATUS "Copying openssl release source files... done")
|
62 |
+
set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
63 |
+
|
64 |
+
set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})
|
65 |
+
|
66 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-rel")
|
67 |
+
vcpkg_execute_required_process(
|
68 |
+
COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
|
69 |
+
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
|
70 |
+
LOGNAME configure-perl-${TARGET_TRIPLET}-rel
|
71 |
+
)
|
72 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-rel done")
|
73 |
+
|
74 |
+
message(STATUS "Build ${TARGET_TRIPLET}-rel")
|
75 |
+
# Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
|
76 |
+
# This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
|
77 |
+
make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
|
78 |
+
execute_process(
|
79 |
+
COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}"
|
80 |
+
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
|
81 |
+
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log"
|
82 |
+
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log"
|
83 |
+
)
|
84 |
+
vcpkg_execute_required_process(
|
85 |
+
COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs
|
86 |
+
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
|
87 |
+
LOGNAME build-${TARGET_TRIPLET}-rel-1)
|
88 |
+
|
89 |
+
message(STATUS "Build ${TARGET_TRIPLET}-rel done")
|
90 |
+
endif()
|
91 |
+
|
92 |
+
|
93 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
94 |
+
# Copy openssl sources.
|
95 |
+
message(STATUS "Copying openssl debug source files...")
|
96 |
+
file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*)
|
97 |
+
foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES})
|
98 |
+
file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
99 |
+
endforeach()
|
100 |
+
message(STATUS "Copying openssl debug source files... done")
|
101 |
+
set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
102 |
+
|
103 |
+
set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
|
104 |
+
|
105 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-dbg")
|
106 |
+
vcpkg_execute_required_process(
|
107 |
+
COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
|
108 |
+
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
|
109 |
+
LOGNAME configure-perl-${TARGET_TRIPLET}-dbg
|
110 |
+
)
|
111 |
+
message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")
|
112 |
+
|
113 |
+
message(STATUS "Build ${TARGET_TRIPLET}-dbg")
|
114 |
+
make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl")
|
115 |
+
execute_process(
|
116 |
+
COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}"
|
117 |
+
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
|
118 |
+
OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log"
|
119 |
+
ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log"
|
120 |
+
)
|
121 |
+
vcpkg_execute_required_process(
|
122 |
+
COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs
|
123 |
+
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
|
124 |
+
LOGNAME build-${TARGET_TRIPLET}-dbg-1)
|
125 |
+
|
126 |
+
message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
|
127 |
+
|
128 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb")
|
129 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb")
|
130 |
+
endif()
|
131 |
+
|
132 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs")
|
133 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private")
|
134 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1")
|
135 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-3")
|
136 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs")
|
137 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1")
|
138 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3")
|
139 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private")
|
140 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
141 |
+
|
142 |
+
if(NOT VCPKG_BUILD_TYPE)
|
143 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll")
|
144 |
+
endif()
|
145 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll")
|
146 |
+
|
147 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules")
|
148 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules")
|
149 |
+
|
150 |
+
file(REMOVE
|
151 |
+
"${CURRENT_PACKAGES_DIR}/ct_log_list.cnf"
|
152 |
+
"${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist"
|
153 |
+
"${CURRENT_PACKAGES_DIR}/openssl.cnf.dist"
|
154 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe"
|
155 |
+
"${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf"
|
156 |
+
"${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist"
|
157 |
+
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf"
|
158 |
+
"${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist"
|
159 |
+
)
|
160 |
+
|
161 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl/")
|
162 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl.exe" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.exe")
|
163 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.cnf")
|
164 |
+
|
165 |
+
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl")
|
166 |
+
|
167 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
168 |
+
# They should be empty, only the exes deleted above were in these directories
|
169 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/")
|
170 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/")
|
171 |
+
endif()
|
172 |
+
|
173 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h"
|
174 |
+
"<winsock.h>"
|
175 |
+
"<winsock2.h>"
|
176 |
+
)
|
177 |
+
|
178 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h"
|
179 |
+
"# include <windows.h>"
|
180 |
+
"#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n# include <windows.h>"
|
181 |
+
)
|
182 |
+
|
183 |
+
vcpkg_copy_pdbs()
|
184 |
+
|
185 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-build-type.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt
|
2 |
+
index 72c5b7e..ca24488 100644
|
3 |
+
--- a/opensubdiv/CMakeLists.txt
|
4 |
+
+++ b/opensubdiv/CMakeLists.txt
|
5 |
+
@@ -124,6 +124,7 @@ if (NOT NO_LIB)
|
6 |
+
|
7 |
+
#---------------------------------------------------------------------------
|
8 |
+
|
9 |
+
+ if (NOT BUILD_SHARED_LIBS)
|
10 |
+
# Build static libs ------------------------------------
|
11 |
+
add_library(osd_static_cpu
|
12 |
+
STATIC
|
13 |
+
@@ -146,6 +147,7 @@ if (NOT NO_LIB)
|
14 |
+
)
|
15 |
+
|
16 |
+
install( TARGETS osd_static_cpu DESTINATION "${CMAKE_LIBDIR_BASE}" )
|
17 |
+
+ endif()
|
18 |
+
|
19 |
+
if( OSD_GPU )
|
20 |
+
# this macro uses FindCUDA.cmake to compile .cu kernel files
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-dependencies.patch
ADDED
@@ -0,0 +1,146 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/FindDXSDK.cmake b/cmake/FindDXSDK.cmake
|
2 |
+
index a396d97..edd06db 100644
|
3 |
+
--- a/cmake/FindDXSDK.cmake
|
4 |
+
+++ b/cmake/FindDXSDK.cmake
|
5 |
+
@@ -48,15 +48,8 @@ if (WIN32)
|
6 |
+
"C:/Program Files/Microsoft DirectX SDK*/Include"
|
7 |
+
)
|
8 |
+
|
9 |
+
- if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64" OR
|
10 |
+
- "${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64")
|
11 |
+
- set(ARCH x64)
|
12 |
+
- else()
|
13 |
+
- set(ARCH x86)
|
14 |
+
- endif()
|
15 |
+
-
|
16 |
+
find_path(LIBRARY_DIR
|
17 |
+
- d3d11.lib
|
18 |
+
+ d3dx11.lib
|
19 |
+
PATHS
|
20 |
+
"${DXSDK_LOCATION}/Lib/${ARCH}"
|
21 |
+
"$ENV{DXSDK_LOCATION}/Lib/${ARCH}"
|
22 |
+
@@ -70,7 +63,7 @@ if (WIN32)
|
23 |
+
|
24 |
+
set(DXSDK_LIBRARY_DIR ${LIBRARY_DIR})
|
25 |
+
|
26 |
+
- foreach(DX_LIB d3d11 d3dcompiler)
|
27 |
+
+ foreach(DX_LIB d3dx11 d3dcompiler)
|
28 |
+
|
29 |
+
find_library(DXSDK_${DX_LIB}_LIBRARY
|
30 |
+
NAMES
|
31 |
+
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
|
32 |
+
index 2f4efd3..5f4f85b 100644
|
33 |
+
--- a/cmake/FindTBB.cmake
|
34 |
+
+++ b/cmake/FindTBB.cmake
|
35 |
+
@@ -30,6 +30,10 @@
|
36 |
+
# TBB_LIBRARIES - The libraries needed to use TBB
|
37 |
+
|
38 |
+
# Obtain include directory
|
39 |
+
+find_package(TBB CONFIG REQUIRED)
|
40 |
+
+set(TBB_FOUND 1)
|
41 |
+
+set(TBB_LIBRARIES TBB::tbb)
|
42 |
+
+if (0)
|
43 |
+
if (WIN32)
|
44 |
+
find_path(TBB_INCLUDE_DIR
|
45 |
+
NAMES
|
46 |
+
@@ -180,4 +184,4 @@ mark_as_advanced(
|
47 |
+
TBB_INCLUDE_DIR
|
48 |
+
TBB_LIBRARIES
|
49 |
+
)
|
50 |
+
-
|
51 |
+
+endif()
|
52 |
+
diff --git a/examples/dxPtexViewer/CMakeLists.txt b/examples/dxPtexViewer/CMakeLists.txt
|
53 |
+
index 2743423..81c8806 100644
|
54 |
+
--- a/examples/dxPtexViewer/CMakeLists.txt
|
55 |
+
+++ b/examples/dxPtexViewer/CMakeLists.txt
|
56 |
+
@@ -36,6 +36,19 @@ set(PLATFORM_LIBRARIES
|
57 |
+
"${ZLIB_LIBRARY}"
|
58 |
+
)
|
59 |
+
|
60 |
+
+if (OPENCL_FOUND)
|
61 |
+
+ list(APPEND PLATFORM_LIBRARIES
|
62 |
+
+ Opengl32
|
63 |
+
+ Cfgmgr32
|
64 |
+
+ )
|
65 |
+
+endif()
|
66 |
+
+
|
67 |
+
+if (DXSDK_FOUND)
|
68 |
+
+ list(APPEND PLATFORM_LIBRARIES
|
69 |
+
+ D3D11
|
70 |
+
+ )
|
71 |
+
+endif()
|
72 |
+
+
|
73 |
+
include_directories(
|
74 |
+
"${OPENSUBDIV_INCLUDE_DIR}"
|
75 |
+
"${DXSDK_INCLUDE_DIR}"
|
76 |
+
diff --git a/examples/dxViewer/CMakeLists.txt b/examples/dxViewer/CMakeLists.txt
|
77 |
+
index 245ecbd..83b39b8 100644
|
78 |
+
--- a/examples/dxViewer/CMakeLists.txt
|
79 |
+
+++ b/examples/dxViewer/CMakeLists.txt
|
80 |
+
@@ -33,6 +33,19 @@ set(PLATFORM_LIBRARIES
|
81 |
+
"${DXSDK_LIBRARIES}"
|
82 |
+
)
|
83 |
+
|
84 |
+
+if (OPENCL_FOUND)
|
85 |
+
+ list(APPEND PLATFORM_LIBRARIES
|
86 |
+
+ Opengl32
|
87 |
+
+ Cfgmgr32
|
88 |
+
+ )
|
89 |
+
+endif()
|
90 |
+
+
|
91 |
+
+if (DXSDK_FOUND)
|
92 |
+
+ list(APPEND PLATFORM_LIBRARIES
|
93 |
+
+ D3D11
|
94 |
+
+ )
|
95 |
+
+endif()
|
96 |
+
+
|
97 |
+
include_directories(
|
98 |
+
"${OPENSUBDIV_INCLUDE_DIR}"
|
99 |
+
"${DXSDK_INCLUDE_DIR}"
|
100 |
+
diff --git a/examples/glEvalLimit/CMakeLists.txt b/examples/glEvalLimit/CMakeLists.txt
|
101 |
+
index 1a71f72..8eaaccb 100644
|
102 |
+
--- a/examples/glEvalLimit/CMakeLists.txt
|
103 |
+
+++ b/examples/glEvalLimit/CMakeLists.txt
|
104 |
+
@@ -41,7 +41,6 @@ if( OPENCL_FOUND )
|
105 |
+
endif()
|
106 |
+
|
107 |
+
if( TBB_FOUND )
|
108 |
+
- include_directories("${TBB_INCLUDE_DIR}")
|
109 |
+
list(APPEND PLATFORM_LIBRARIES
|
110 |
+
"${TBB_LIBRARIES}"
|
111 |
+
)
|
112 |
+
diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt
|
113 |
+
index adb0191..0f90a37 100644
|
114 |
+
--- a/opensubdiv/CMakeLists.txt
|
115 |
+
+++ b/opensubdiv/CMakeLists.txt
|
116 |
+
@@ -49,7 +49,6 @@ if (NOT NO_LIB)
|
117 |
+
endif()
|
118 |
+
|
119 |
+
if( TBB_FOUND )
|
120 |
+
- include_directories("${TBB_INCLUDE_DIR}")
|
121 |
+
list(APPEND PLATFORM_CPU_LIBRARIES
|
122 |
+
${TBB_LIBRARIES}
|
123 |
+
)
|
124 |
+
diff --git a/opensubdiv/osd/CMakeLists.txt b/opensubdiv/osd/CMakeLists.txt
|
125 |
+
index 75f64b6..90d5ea2 100644
|
126 |
+
--- a/opensubdiv/osd/CMakeLists.txt
|
127 |
+
+++ b/opensubdiv/osd/CMakeLists.txt
|
128 |
+
@@ -88,7 +88,6 @@ set(TBB_PUBLIC_HEADERS
|
129 |
+
)
|
130 |
+
|
131 |
+
if( TBB_FOUND )
|
132 |
+
- include_directories("${TBB_INCLUDE_DIR}")
|
133 |
+
|
134 |
+
list(APPEND CPU_SOURCE_FILES
|
135 |
+
tbbEvaluator.cpp
|
136 |
+
@@ -379,6 +378,10 @@ add_library(osd_cpu_obj
|
137 |
+
${PUBLIC_HEADER_FILES}
|
138 |
+
)
|
139 |
+
|
140 |
+
+if (TBB_FOUND)
|
141 |
+
+ target_link_libraries(osd_cpu_obj ${TBB_LIBRARIES})
|
142 |
+
+endif()
|
143 |
+
+
|
144 |
+
set_target_properties(osd_cpu_obj
|
145 |
+
PROPERTIES
|
146 |
+
FOLDER "opensubdiv"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-mac-build.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt
|
2 |
+
index ca24488..adb0191 100644
|
3 |
+
--- a/opensubdiv/CMakeLists.txt
|
4 |
+
+++ b/opensubdiv/CMakeLists.txt
|
5 |
+
@@ -241,7 +241,7 @@ if (NOT NO_LIB)
|
6 |
+
endif()
|
7 |
+
|
8 |
+
# Build frameworks ----------------------------------
|
9 |
+
- if(APPLE)
|
10 |
+
+ if(APPLE AND OSD_GPU)
|
11 |
+
get_directory_property(OSD_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES)
|
12 |
+
get_directory_property(FAR_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES)
|
13 |
+
get_directory_property(SDC_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix-version-search.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
|
2 |
+
index 485e55e..1c98b91 100644
|
3 |
+
--- a/cmake/FindOpenCL.cmake
|
4 |
+
+++ b/cmake/FindOpenCL.cmake
|
5 |
+
@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS)
|
6 |
+
|
7 |
+
if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h")
|
8 |
+
|
9 |
+
- file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$")
|
10 |
+
+ file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$")
|
11 |
+
|
12 |
+
foreach(LINE ${LINES})
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/fix_compile-option.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index b69912ae..dcde4297 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -218,7 +218,7 @@ elseif(MSVC)
|
6 |
+
|
7 |
+
list(APPEND OSD_COMPILER_FLAGS
|
8 |
+
/W3 # Use warning level recommended for production purposes.
|
9 |
+
- /WX # Treat all compiler warnings as errors.
|
10 |
+
+ # /WX # Treat all compiler warnings as errors.
|
11 |
+
|
12 |
+
# warning C4005: macro redefinition
|
13 |
+
/wd4005
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/opensubdiv/portfile.cmake
ADDED
@@ -0,0 +1,135 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS)
|
2 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
3 |
+
endif()
|
4 |
+
|
5 |
+
vcpkg_from_github(
|
6 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
7 |
+
REPO PixarAnimationStudios/OpenSubdiv
|
8 |
+
REF 82ab1b9f54c87fdd7e989a3470d53e137b8ca270 # 3.4.3
|
9 |
+
SHA512 607cb9aa05d83a24bc2102bfd28abfec58f5723b1c56f6f431111ebf98f105ff7ca2a77610953acd21f73cb74d8d8ec68db3aeb11be1f9ca56d87c36c58dd095
|
10 |
+
HEAD_REF master
|
11 |
+
PATCHES
|
12 |
+
fix_compile-option.patch
|
13 |
+
fix-version-search.patch
|
14 |
+
fix-build-type.patch
|
15 |
+
fix-mac-build.patch
|
16 |
+
fix-dependencies.patch
|
17 |
+
)
|
18 |
+
|
19 |
+
if(VCPKG_TARGET_IS_LINUX)
|
20 |
+
message(
|
21 |
+
"OpenSubdiv currently requires the following libraries from the system package manager:
|
22 |
+
xinerama xxf86vm
|
23 |
+
|
24 |
+
These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev")
|
25 |
+
endif()
|
26 |
+
|
27 |
+
vcpkg_find_acquire_program(PYTHON2)
|
28 |
+
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
|
29 |
+
vcpkg_add_to_path("${PYTHON2_DIR}")
|
30 |
+
|
31 |
+
if (VCPKG_CRT_LINKAGE STREQUAL static)
|
32 |
+
set(STATIC_CRT_LNK ON)
|
33 |
+
else()
|
34 |
+
set(STATIC_CRT_LNK OFF)
|
35 |
+
endif()
|
36 |
+
|
37 |
+
if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
38 |
+
message(FATAL_ERROR "Feature 'cuda' can only build on x64 arch.")
|
39 |
+
endif()
|
40 |
+
|
41 |
+
if (("dx" IN_LIST FEATURES OR "omp" IN_LIST FEATURES) AND NOT VCPKG_TARGET_IS_WINDOWS)
|
42 |
+
message(FATAL_ERROR "Feature 'dx' and 'omp' only support Windows.")
|
43 |
+
endif()
|
44 |
+
|
45 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
46 |
+
FEATURES
|
47 |
+
"true-deriv-eval" OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
|
48 |
+
INVERTED_FEATURES
|
49 |
+
"cuda" NO_CUDA
|
50 |
+
"dx" NO_DX
|
51 |
+
"examples" NO_EXAMPLES
|
52 |
+
"glew" NO_GLEW
|
53 |
+
"glfw" NO_GLFW
|
54 |
+
"glfw" NO_GLFW_X11
|
55 |
+
"omp" NO_OMP
|
56 |
+
"opencl" NO_OPENCL
|
57 |
+
"ptex" NO_PTEX
|
58 |
+
"tbb" NO_TBB
|
59 |
+
"tutorials" NO_TUTORIALS
|
60 |
+
)
|
61 |
+
|
62 |
+
set(OSD_EXTRA_OPTS)
|
63 |
+
if ("ptex" IN_LIST FEATURES)
|
64 |
+
list(APPEND OSD_EXTRA_OPTS -DPTEX_LOCATION=${CURRENT_INSTALLED_DIR})
|
65 |
+
endif()
|
66 |
+
if ("glew" IN_LIST FEATURES)
|
67 |
+
list(APPEND OSD_EXTRA_OPTS -DGLEW_LOCATION=${CURRENT_INSTALLED_DIR})
|
68 |
+
endif()
|
69 |
+
if ("glfw" IN_LIST FEATURES)
|
70 |
+
list(APPEND OSD_EXTRA_OPTS -DGLFW_LOCATION=${CURRENT_INSTALLED_DIR})
|
71 |
+
endif()
|
72 |
+
if ("dx" IN_LIST FEATURES)
|
73 |
+
list(APPEND OSD_EXTRA_OPTS -DDXSDK_LOCATION=${CURRENT_INSTALLED_DIR})
|
74 |
+
endif()
|
75 |
+
|
76 |
+
vcpkg_cmake_configure(
|
77 |
+
SOURCE_PATH ${SOURCE_PATH}
|
78 |
+
OPTIONS
|
79 |
+
-DMSVC_STATIC_CRT=${STATIC_CRT_LNK}
|
80 |
+
-DNO_LIB=OFF
|
81 |
+
-DNO_REGRESSION=ON
|
82 |
+
-DNO_DOC=ON
|
83 |
+
-DNO_TESTS=ON
|
84 |
+
-DNO_GLTESTS=ON
|
85 |
+
-DNO_CLEW=ON
|
86 |
+
-DNO_METAL=ON
|
87 |
+
-DNO_OPENGL=ON # missing glloader
|
88 |
+
${FEATURE_OPTIONS}
|
89 |
+
${OSD_EXTRA_OPTS}
|
90 |
+
MAYBE_UNUSED_VARIABLES
|
91 |
+
MSVC_STATIC_CRT
|
92 |
+
)
|
93 |
+
|
94 |
+
vcpkg_cmake_install()
|
95 |
+
|
96 |
+
if ("opencl" IN_LIST FEATURES OR "dx" IN_LIST FEATURES)
|
97 |
+
vcpkg_copy_tools(TOOL_NAMES stringify AUTO_CLEAN)
|
98 |
+
endif()
|
99 |
+
|
100 |
+
if ("examples" IN_LIST FEATURES)
|
101 |
+
if ("dx" IN_LIST FEATURES)
|
102 |
+
vcpkg_copy_tools(TOOL_NAMES dxViewer AUTO_CLEAN)
|
103 |
+
if ("ptex" IN_LIST FEATURES)
|
104 |
+
vcpkg_copy_tools(TOOL_NAMES dxPtexViewer AUTO_CLEAN)
|
105 |
+
endif()
|
106 |
+
endif()
|
107 |
+
endif()
|
108 |
+
|
109 |
+
if ("tutorials" IN_LIST FEATURES)
|
110 |
+
file(GLOB TUTORIALS_TOOLS "${CURRENT_PACKAGES_DIR}/bin/tutorials/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
111 |
+
set(TUTORIALS_TOOL_NAMES )
|
112 |
+
foreach(TUTORIALS_TOOL IN LISTS TUTORIALS_TOOLS)
|
113 |
+
get_filename_component(TUTORIALS_TOOL_NAME "${TUTORIALS_TOOL}" NAME_WE)
|
114 |
+
list(APPEND TUTORIALS_TOOL_NAMES "${TUTORIALS_TOOL_NAME}")
|
115 |
+
endforeach()
|
116 |
+
if (TUTORIALS_TOOL_NAMES)
|
117 |
+
vcpkg_copy_tools(TOOL_NAMES ${TUTORIALS_TOOL_NAMES} SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/tutorials/" AUTO_CLEAN)
|
118 |
+
endif()
|
119 |
+
endif()
|
120 |
+
|
121 |
+
# The header files are read only and can't remove when remove this port
|
122 |
+
file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h")
|
123 |
+
file(CHMOD_RECURSE ${OSD_HDRS}
|
124 |
+
PERMISSIONS
|
125 |
+
OWNER_READ OWNER_WRITE
|
126 |
+
GROUP_READ GROUP_WRITE
|
127 |
+
WORLD_READ WORLD_WRITE
|
128 |
+
)
|
129 |
+
|
130 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
|
131 |
+
"${CURRENT_PACKAGES_DIR}/bin"
|
132 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
133 |
+
)
|
134 |
+
|
135 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|