Spaces:
Sleeping
Sleeping
15ef7358387f587b4ed17bf23aa0a1ba4b2dacc35987aa6d7f4682d7510db8a8
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/0002-fix-libevent.patch +30 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/portfile.cmake +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/vcpkg.json +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/fix-build-error.patch +278 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/fix-dependency-hdf5.patch +56 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/portfile.cmake +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/vcpkg.json +33 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/README.md +2 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/portfile.cmake +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/vcpkg.json +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cpu/fix-dependencies.patch +33 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cpu/portfile.cmake +88 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cpu/vcpkg.json +96 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cuda/portfile.cmake +87 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cuda/vcpkg.json +94 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/fix-uwp-build.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/no-werror.patch +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/portfile.cmake +51 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/vcpkg.json +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/fix-cmakelists.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/portfile.cmake +37 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/vcpkg.json +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/config-path.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/findlibsfix.patch +47 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/fix-system-link.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/include.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/portfile.cmake +75 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/vcpkg.json +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidlite/portfile.cmake +33 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidlite/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/fix-dependencies.patch +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/portfile.cmake +68 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/separate-gentables.patch +46 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/vcpkg.json +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmem/portfile.cmake +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmem/vcpkg.json +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmi4cpp/portfile.cmake +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmi4cpp/vcpkg.json +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/0001-remove-install-prefix.patch +48 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/portfile.cmake +67 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/fix-invalid-command.patch +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/fix-write-batch.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/portfile.cmake +66 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/usage +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/folly/boost-1.70.patch +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/folly/disable-non-underscore-posix-names.patch +34 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/0002-fix-libevent.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
2 |
+
index 80c5051..9f2e3e6 100644
|
3 |
+
--- a/fizz/CMakeLists.txt
|
4 |
+
+++ b/fizz/CMakeLists.txt
|
5 |
+
@@ -92,10 +92,10 @@ endif()
|
6 |
+
|
7 |
+
find_package(ZLIB REQUIRED)
|
8 |
+
|
9 |
+
-find_package(Libevent CONFIG QUIET)
|
10 |
+
-if(TARGET event)
|
11 |
+
+find_package(Libevent CONFIG REQUIRED)
|
12 |
+
+if(TARGET libevent::core)
|
13 |
+
message(STATUS "Found libevent from package config")
|
14 |
+
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
|
15 |
+
+ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core)
|
16 |
+
else()
|
17 |
+
find_package(Libevent MODULE REQUIRED)
|
18 |
+
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
|
19 |
+
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
20 |
+
index b28750f..282c42d 100644
|
21 |
+
--- a/fizz/cmake/fizz-config.cmake.in
|
22 |
+
+++ b/fizz/cmake/fizz-config.cmake.in
|
23 |
+
@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro)
|
24 |
+
find_dependency(unofficial-sodium CONFIG REQUIRED)
|
25 |
+
find_dependency(folly CONFIG)
|
26 |
+
find_dependency(ZLIB)
|
27 |
+
+find_dependency(Libevent CONFIG)
|
28 |
+
|
29 |
+
if (NOT fizz_FIND_QUIETLY)
|
30 |
+
message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/portfile.cmake
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO facebookincubator/fizz
|
6 |
+
REF v2022.03.21.00
|
7 |
+
SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
0001-fix-libsodium.patch
|
11 |
+
0002-fix-libevent.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
# Prefer installed config files
|
15 |
+
file(REMOVE
|
16 |
+
${SOURCE_PATH}/fizz/cmake/FindGMock.cmake
|
17 |
+
${SOURCE_PATH}/fizz/cmake/FindGflags.cmake
|
18 |
+
${SOURCE_PATH}/fizz/cmake/FindGlog.cmake
|
19 |
+
${SOURCE_PATH}/fizz/cmake/FindLibevent.cmake
|
20 |
+
)
|
21 |
+
|
22 |
+
vcpkg_cmake_configure(
|
23 |
+
SOURCE_PATH "${SOURCE_PATH}/fizz"
|
24 |
+
OPTIONS
|
25 |
+
-DBUILD_TESTS=OFF
|
26 |
+
-DBUILD_EXAMPLES=OFF
|
27 |
+
-DINCLUDE_INSTALL_DIR:STRING=include
|
28 |
+
)
|
29 |
+
|
30 |
+
vcpkg_cmake_install()
|
31 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fizz)
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
|
34 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz")
|
35 |
+
|
36 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
37 |
+
|
38 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")
|
39 |
+
|
40 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fizz/vcpkg.json
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fizz",
|
3 |
+
"version-string": "2022.03.21.00",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "a TLS 1.3 implementation by Facebook",
|
6 |
+
"homepage": "https://github.com/facebookincubator/fizz",
|
7 |
+
"dependencies": [
|
8 |
+
"double-conversion",
|
9 |
+
"fmt",
|
10 |
+
"folly",
|
11 |
+
"libevent",
|
12 |
+
"libsodium",
|
13 |
+
"openssl",
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
{
|
19 |
+
"name": "vcpkg-cmake-config",
|
20 |
+
"host": true
|
21 |
+
},
|
22 |
+
"zstd"
|
23 |
+
]
|
24 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/fix-build-error.patch
ADDED
@@ -0,0 +1,278 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From c111a280591aa542914ca845c0be6099a94315ad Mon Sep 17 00:00:00 2001
|
2 |
+
From: Lars Glud <[email protected]>
|
3 |
+
Date: Tue, 16 Mar 2021 10:40:06 +0100
|
4 |
+
Subject: [PATCH] fix build error
|
5 |
+
|
6 |
+
---
|
7 |
+
CMakeLists.txt | 8 ++-
|
8 |
+
cmake/Config.cmake.in | 5 ++
|
9 |
+
src/cpp/CMakeLists.txt | 149 ++++++++++++++++++++++++-----------------
|
10 |
+
3 files changed, 96 insertions(+), 66 deletions(-)
|
11 |
+
|
12 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
13 |
+
index f4b94d2..33b2c26 100644
|
14 |
+
--- a/CMakeLists.txt
|
15 |
+
+++ b/CMakeLists.txt
|
16 |
+
@@ -1,4 +1,4 @@
|
17 |
+
-cmake_minimum_required(VERSION 2.6)
|
18 |
+
+cmake_minimum_required(VERSION 2.8.12)
|
19 |
+
|
20 |
+
if(COMMAND cmake_policy)
|
21 |
+
cmake_policy(SET CMP0003 NEW)
|
22 |
+
@@ -49,6 +49,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
|
23 |
+
# set output path for tests
|
24 |
+
set(TEST_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/test)
|
25 |
+
|
26 |
+
+option(BUILD_SHARED_LIBS "Build shared version of libs" ON)
|
27 |
+
+option(WITH_HDF5 "Build hdf5 library" OFF)
|
28 |
+
option(BUILD_C_BINDINGS "Build C bindings" ON)
|
29 |
+
option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
|
30 |
+
option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
|
31 |
+
@@ -146,8 +148,9 @@ if (BUILD_CUDA_LIB)
|
32 |
+
endif(CUDA_FOUND)
|
33 |
+
endif(BUILD_CUDA_LIB)
|
34 |
+
|
35 |
+
-find_package(PkgConfig REQUIRED)
|
36 |
+
-pkg_check_modules(LZ4 REQUIRED liblz4)
|
37 |
+
+find_package(PkgConfig)
|
38 |
+
+find_package(lz4 CONFIG REQUIRED)
|
39 |
+
+set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} liblz4")
|
40 |
+
|
41 |
+
#set the C/C++ include path to the "include" directory
|
42 |
+
include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp)
|
43 |
+
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
|
44 |
+
index 6b95a71..e8bb3f7 100644
|
45 |
+
--- a/cmake/Config.cmake.in
|
46 |
+
+++ b/cmake/Config.cmake.in
|
47 |
+
@@ -1,5 +1,11 @@
|
48 |
+
@PACKAGE_INIT@
|
49 |
+
|
50 |
+
+# Get definition of 'find_dependency' macro
|
51 |
+
+include(CMakeFindDependencyMacro)
|
52 |
+
+# Find lz4. This will create 'lz4::lz4' target
|
53 |
+
+find_dependency(lz4)
|
54 |
+
+@CMAKE_EXTERNAL_DEPS@
|
55 |
+
+
|
56 |
+
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
|
57 |
+
check_required_components("flann")
|
58 |
+
|
59 |
+
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
|
60 |
+
index b421abb..474cd7e 100644
|
61 |
+
--- a/src/cpp/CMakeLists.txt
|
62 |
+
+++ b/src/cpp/CMakeLists.txt
|
63 |
+
@@ -8,13 +8,7 @@ file(GLOB_RECURSE C_SOURCES flann.cpp)
|
64 |
+
file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
|
65 |
+
file(GLOB_RECURSE CU_SOURCES *.cu)
|
66 |
+
|
67 |
+
-add_library(flann_cpp_s STATIC ${CPP_SOURCES})
|
68 |
+
-target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES})
|
69 |
+
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
|
70 |
+
- set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC)
|
71 |
+
-endif()
|
72 |
+
-set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
|
73 |
+
-
|
74 |
+
+#Set flags if we build CUDA versions
|
75 |
+
if (BUILD_CUDA_LIB)
|
76 |
+
SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
|
77 |
+
if(CMAKE_COMPILER_IS_GNUCC)
|
78 |
+
@@ -25,75 +19,93 @@ if (BUILD_CUDA_LIB)
|
79 |
+
else()
|
80 |
+
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" )
|
81 |
+
endif()
|
82 |
+
- cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES})
|
83 |
+
- set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
|
84 |
+
endif()
|
85 |
+
|
86 |
+
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
|
87 |
+
- add_library(flann_cpp SHARED "")
|
88 |
+
- set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
|
89 |
+
- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
|
90 |
+
+if(NOT BUILD_SHARED_LIBS)
|
91 |
+
+ add_library(flann_cpp_s STATIC ${CPP_SOURCES})
|
92 |
+
+ target_link_libraries(flann_cpp_s PUBLIC lz4::lz4)
|
93 |
+
+ set_property(TARGET flann_cpp_s PROPERTY OUTPUT_NAME flann_cpp)
|
94 |
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
|
95 |
+
+ set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC)
|
96 |
+
+ endif()
|
97 |
+
+
|
98 |
+
+ if (BUILD_CUDA_LIB)
|
99 |
+
+ cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES})
|
100 |
+
+ target_link_libraries(flann_cuda_s lz4::lz4)
|
101 |
+
+ set_property(TARGET flann_cuda_s PROPERTY OUTPUT_NAME flann_cuda)
|
102 |
+
+ set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
|
103 |
+
+ endif()
|
104 |
+
+endif()
|
105 |
+
|
106 |
+
- if (BUILD_CUDA_LIB)
|
107 |
+
- cuda_add_library(flann_cuda SHARED "")
|
108 |
+
+if(BUILD_SHARED_LIBS)
|
109 |
+
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
|
110 |
+
+ add_library(flann_cpp SHARED ${CPP_SOURCES})
|
111 |
+
+ set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
|
112 |
+
+ target_link_libraries(flann_cpp PUBLIC lz4::lz4)
|
113 |
+
+ if (BUILD_CUDA_LIB)
|
114 |
+
+ cuda_add_library(flann_cuda SHARED ${CU_SOURCES})
|
115 |
+
set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
|
116 |
+
- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
|
117 |
+
- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
|
118 |
+
- # target_link_libraries(flann_cuda cudpp_x86_64)
|
119 |
+
- endif()
|
120 |
+
-else()
|
121 |
+
- add_library(flann_cpp SHARED ${CPP_SOURCES})
|
122 |
+
- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
|
123 |
+
- # export lz4 headers, so that MSVC to creates flann_cpp.lib
|
124 |
+
- set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES)
|
125 |
+
- if (BUILD_CUDA_LIB)
|
126 |
+
- cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
|
127 |
+
set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
|
128 |
+
- endif()
|
129 |
+
-endif()
|
130 |
+
-
|
131 |
+
-set_target_properties(flann_cpp PROPERTIES
|
132 |
+
- VERSION ${FLANN_VERSION}
|
133 |
+
- SOVERSION ${FLANN_SOVERSION}
|
134 |
+
- DEFINE_SYMBOL FLANN_EXPORTS
|
135 |
+
-)
|
136 |
+
-
|
137 |
+
-if (BUILD_CUDA_LIB)
|
138 |
+
- set_target_properties(flann_cuda PROPERTIES
|
139 |
+
- VERSION ${FLANN_VERSION}
|
140 |
+
- SOVERSION ${FLANN_SOVERSION}
|
141 |
+
- DEFINE_SYMBOL FLANN_EXPORTS
|
142 |
+
- )
|
143 |
+
+ endif()
|
144 |
+
+ else()
|
145 |
+
+ add_library(flann_cpp SHARED ${CPP_SOURCES})
|
146 |
+
+ target_link_libraries(flann_cpp PUBLIC lz4::lz4)
|
147 |
+
+ # export lz4 headers, so that MSVC to creates flann_cpp.lib
|
148 |
+
+ set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES)
|
149 |
+
+ if (BUILD_CUDA_LIB)
|
150 |
+
+ cuda_add_library(flann_cuda SHARED ${CU_SOURCES})
|
151 |
+
+ target_link_libraries(flann_cuda lz4::lz4)
|
152 |
+
+ set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
|
153 |
+
+ endif()
|
154 |
+
+ endif()
|
155 |
+
+
|
156 |
+
+ set_target_properties(flann_cpp PROPERTIES
|
157 |
+
+ VERSION ${FLANN_VERSION}
|
158 |
+
+ SOVERSION ${FLANN_SOVERSION}
|
159 |
+
+ DEFINE_SYMBOL FLANN_EXPORTS
|
160 |
+
+ )
|
161 |
+
+
|
162 |
+
+ if (BUILD_CUDA_LIB)
|
163 |
+
+ set_target_properties(flann_cuda PROPERTIES
|
164 |
+
+ VERSION ${FLANN_VERSION}
|
165 |
+
+ SOVERSION ${FLANN_SOVERSION}
|
166 |
+
+ DEFINE_SYMBOL FLANN_EXPORTS
|
167 |
+
+ )
|
168 |
+
+ endif()
|
169 |
+
endif()
|
170 |
+
|
171 |
+
-
|
172 |
+
if (USE_MPI AND HDF5_IS_PARALLEL)
|
173 |
+
- add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp)
|
174 |
+
- target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
|
175 |
+
+ if(BUILD_SHARED_LIBS)
|
176 |
+
+ add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp)
|
177 |
+
+ target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
|
178 |
+
|
179 |
+
- add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp)
|
180 |
+
- target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
|
181 |
+
+ add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp)
|
182 |
+
+ target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
|
183 |
+
|
184 |
+
- install (TARGETS flann_mpi_client flann_mpi_server
|
185 |
+
- DESTINATION bin)
|
186 |
+
+ install (TARGETS flann_mpi_client flann_mpi_server
|
187 |
+
+ DESTINATION bin)
|
188 |
+
+ endif()
|
189 |
+
endif()
|
190 |
+
|
191 |
+
-
|
192 |
+
if (BUILD_C_BINDINGS)
|
193 |
+
+ if(NOT BUILD_SHARED_LIBS)
|
194 |
+
add_library(flann_s STATIC ${C_SOURCES})
|
195 |
+
- target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
|
196 |
+
+ target_link_libraries(flann_s PUBLIC lz4::lz4)
|
197 |
+
+ set_property(TARGET flann_s PROPERTY OUTPUT_NAME flann)
|
198 |
+
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
|
199 |
+
set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC)
|
200 |
+
endif()
|
201 |
+
set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
|
202 |
+
-
|
203 |
+
+ endif()
|
204 |
+
+
|
205 |
+
+ if(BUILD_SHARED_LIBS)
|
206 |
+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
|
207 |
+
- add_library(flann SHARED "")
|
208 |
+
+ add_library(flann SHARED ${C_SOURCES})
|
209 |
+
+ target_link_libraries(flann PUBLIC lz4::lz4)
|
210 |
+
set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
|
211 |
+
- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
|
212 |
+
else()
|
213 |
+
add_library(flann SHARED ${C_SOURCES})
|
214 |
+
- target_link_libraries(flann -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state)
|
215 |
+
+ target_link_libraries(flann PUBLIC lz4::lz4)
|
216 |
+
|
217 |
+
if(MINGW AND OPENMP_FOUND)
|
218 |
+
target_link_libraries(flann gomp)
|
219 |
+
@@ -105,20 +117,31 @@ if (BUILD_C_BINDINGS)
|
220 |
+
SOVERSION ${FLANN_SOVERSION}
|
221 |
+
DEFINE_SYMBOL FLANN_EXPORTS
|
222 |
+
)
|
223 |
+
+ endif()
|
224 |
+
endif()
|
225 |
+
|
226 |
+
if(WIN32)
|
227 |
+
-if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS)
|
228 |
+
- install (
|
229 |
+
- TARGETS flann
|
230 |
+
- RUNTIME DESTINATION share/flann/matlab
|
231 |
+
- )
|
232 |
+
-endif()
|
233 |
+
+ if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS)
|
234 |
+
+ install (
|
235 |
+
+ TARGETS flann
|
236 |
+
+ RUNTIME DESTINATION share/flann/matlab
|
237 |
+
+ )
|
238 |
+
+ endif()
|
239 |
+
endif(WIN32)
|
240 |
+
|
241 |
+
+if(NOT BUILD_SHARED_LIBS)
|
242 |
+
+ list(APPEND FLANN_TARGETS_CPP "flann_cpp_s")
|
243 |
+
+ list(APPEND FLANN_TARGETS_C "flann_s")
|
244 |
+
+ list(APPEND FLANN_TARGETS_CUDA "flann_cuda_s")
|
245 |
+
+endif()
|
246 |
+
+if(BUILD_SHARED_LIBS)
|
247 |
+
+ list(APPEND FLANN_TARGETS_CPP "flann_cpp")
|
248 |
+
+ list(APPEND FLANN_TARGETS_C "flann")
|
249 |
+
+ list(APPEND FLANN_TARGETS_CUDA "flann_cuda")
|
250 |
+
+endif()
|
251 |
+
|
252 |
+
install (
|
253 |
+
- TARGETS flann_cpp flann_cpp_s
|
254 |
+
+ TARGETS ${FLANN_TARGETS_CPP}
|
255 |
+
EXPORT ${targets_export_name}
|
256 |
+
INCLUDES DESTINATION include
|
257 |
+
RUNTIME DESTINATION bin
|
258 |
+
@@ -128,7 +151,7 @@ install (
|
259 |
+
|
260 |
+
if (BUILD_CUDA_LIB)
|
261 |
+
install (
|
262 |
+
- TARGETS flann_cuda flann_cuda_s
|
263 |
+
+ TARGETS ${FLANN_TARGETS_CUDA}
|
264 |
+
EXPORT ${targets_export_name}
|
265 |
+
INCLUDES DESTINATION include
|
266 |
+
RUNTIME DESTINATION bin
|
267 |
+
@@ -139,7 +162,7 @@ endif()
|
268 |
+
|
269 |
+
if (BUILD_C_BINDINGS)
|
270 |
+
install (
|
271 |
+
- TARGETS flann flann_s
|
272 |
+
+ TARGETS ${FLANN_TARGETS_C}
|
273 |
+
EXPORT ${targets_export_name}
|
274 |
+
INCLUDES DESTINATION include
|
275 |
+
RUNTIME DESTINATION bin
|
276 |
+
--
|
277 |
+
2.29.2.windows.2
|
278 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/fix-dependency-hdf5.patch
ADDED
@@ -0,0 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 9f1dbcb74..5587c896e 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -77,11 +77,19 @@ if (NOT PYTHON_EXECUTABLE)
|
6 |
+
endif()
|
7 |
+
endif()
|
8 |
+
|
9 |
+
-find_hdf5()
|
10 |
+
+if (WITH_HDF5)
|
11 |
+
+find_package(HDF5 CONFIG REQUIRED)
|
12 |
+
if (NOT HDF5_FOUND)
|
13 |
+
- message(WARNING "hdf5 library not found, some tests will not be run")
|
14 |
+
+ message(ERROR "hdf5 library not found")
|
15 |
+
else()
|
16 |
+
- include_directories(${HDF5_INCLUDE_DIR})
|
17 |
+
+ if (TARGET hdf5::hdf5-shared)
|
18 |
+
+ link_libraries(hdf5::hdf5-shared)
|
19 |
+
+ elseif (TARGET hdf5::hdf5-static)
|
20 |
+
+ link_libraries(hdf5::hdf5-static)
|
21 |
+
+ endif()
|
22 |
+
+ set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} hdf5")
|
23 |
+
+ set(CMAKE_EXTERNAL_DEPS "find_dependency(HDF5)")
|
24 |
+
+endif()
|
25 |
+
endif()
|
26 |
+
|
27 |
+
if (USE_MPI OR HDF5_IS_PARALLEL)
|
28 |
+
|
29 |
+
diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
|
30 |
+
index 8aef8e0..747414f 100644
|
31 |
+
--- a/cmake/flann_utils.cmake
|
32 |
+
+++ b/cmake/flann_utils.cmake
|
33 |
+
@@ -21,21 +21,8 @@ endmacro(DISSECT_VERSION)
|
34 |
+
|
35 |
+
# workaround a FindHDF5 bug
|
36 |
+
macro(find_hdf5)
|
37 |
+
- find_package(HDF5)
|
38 |
+
-
|
39 |
+
- set( HDF5_IS_PARALLEL FALSE )
|
40 |
+
- foreach( _dir ${HDF5_INCLUDE_DIRS} )
|
41 |
+
- if( EXISTS "${_dir}/H5pubconf.h" )
|
42 |
+
- file( STRINGS "${_dir}/H5pubconf.h"
|
43 |
+
- HDF5_HAVE_PARALLEL_DEFINE
|
44 |
+
- REGEX "HAVE_PARALLEL 1" )
|
45 |
+
- if( HDF5_HAVE_PARALLEL_DEFINE )
|
46 |
+
- set( HDF5_IS_PARALLEL TRUE )
|
47 |
+
- endif()
|
48 |
+
- endif()
|
49 |
+
- endforeach()
|
50 |
+
- set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
|
51 |
+
- "HDF5 library compiled with parallel IO support" )
|
52 |
+
+ find_package(hdf5 CONFIG)
|
53 |
+
+ set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL})
|
54 |
+
mark_as_advanced( HDF5_IS_PARALLEL )
|
55 |
+
endmacro(find_hdf5)
|
56 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/portfile.cmake
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg.
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO flann-lib/flann
|
6 |
+
REF 1d04523268c388dabf1c0865d69e1b638c8c7d9d
|
7 |
+
SHA512 61e322222c2daa0b9677095e5ca231cba7c305ce754ad8e659eee350111c1e04351181c3af04e45ab6e5c9edea49c7b9ec6499bb0dbc080b87af36eb11c6ef7c
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
fix-build-error.patch
|
11 |
+
fix-dependency-hdf5.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES
|
16 |
+
hdf5 WITH_HDF5
|
17 |
+
cuda BUILD_CUDA_LIB
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_cmake_configure(
|
21 |
+
SOURCE_PATH ${SOURCE_PATH}
|
22 |
+
DISABLE_PARALLEL_CONFIGURE
|
23 |
+
OPTIONS ${FEATURE_OPTIONS}
|
24 |
+
-DBUILD_EXAMPLES=OFF
|
25 |
+
-DBUILD_TESTS=OFF
|
26 |
+
-DBUILD_DOC=OFF
|
27 |
+
-DBUILD_PYTHON_BINDINGS=OFF
|
28 |
+
-DBUILD_MATLAB_BINDINGS=OFF
|
29 |
+
OPTIONS_DEBUG
|
30 |
+
-DCMAKE_DEBUG_POSTFIX=d
|
31 |
+
)
|
32 |
+
|
33 |
+
vcpkg_cmake_install()
|
34 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
35 |
+
|
36 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
37 |
+
|
38 |
+
# Handle copyright
|
39 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright)
|
40 |
+
|
41 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flann/vcpkg.json
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flann",
|
3 |
+
"version-date": "2019-04-07",
|
4 |
+
"port-version": 5,
|
5 |
+
"description": "Fast Library for Approximate Nearest Neighbors",
|
6 |
+
"homepage": "https://github.com/mariusmuja/flann",
|
7 |
+
"license": "BSD-3-Clause",
|
8 |
+
"dependencies": [
|
9 |
+
"lz4",
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true
|
17 |
+
}
|
18 |
+
],
|
19 |
+
"features": {
|
20 |
+
"cuda": {
|
21 |
+
"description": "CUDA support for FLANN",
|
22 |
+
"dependencies": [
|
23 |
+
"cuda"
|
24 |
+
]
|
25 |
+
},
|
26 |
+
"hdf5": {
|
27 |
+
"description": "Build with hdf5",
|
28 |
+
"dependencies": [
|
29 |
+
"hdf5"
|
30 |
+
]
|
31 |
+
}
|
32 |
+
}
|
33 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/README.md
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
|
|
1 |
+
# flash-runtime-extensions
|
2 |
+
CMake port of FlashRuntimeExtensions for vcpkg
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/portfile.cmake
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO al-sabr/FlashRuntimeExtensions
|
6 |
+
REF v2.4
|
7 |
+
SHA512 16db340a9c8d868c64b9771e3ac9a20e775fa145f36158e798733b788fd99d1ac101bfae93b8f88b0e5a0a530e0261c1fbdf7d367031dd3108c14ee00a106c10
|
8 |
+
HEAD_REF main
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_cmake_install()
|
16 |
+
vcpkg_cmake_config_fixup()
|
17 |
+
|
18 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
19 |
+
|
20 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
21 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
22 |
+
|
23 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flash-runtime-extensions/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flash-runtime-extensions",
|
3 |
+
"version": "2.4",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Adobe AIR Native Extension API for Windows/MacOS/Linux",
|
6 |
+
"homepage": "https://github.com/al-sabr/FlashRuntimeExtensions",
|
7 |
+
"supports": "!(arm | uwp)",
|
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/flashlight-cpu/fix-dependencies.patch
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 9d9eacb..b530743 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -183,7 +183,7 @@ if (FL_BUILD_CORE)
|
6 |
+
|
7 |
+
# If cereal is found in a user-defined location, use it rather than
|
8 |
+
# downloading from source
|
9 |
+
- find_package(cereal)
|
10 |
+
+ find_package(cereal CONFIG REQUIRED)
|
11 |
+
if (NOT TARGET cereal AND NOT cereal_FOUND AND FL_BUILD_STANDALONE)
|
12 |
+
message(STATUS "cereal NOT found. Will download from source")
|
13 |
+
set(CEREAL_INSTALL_PATH ${FL_INSTALL_INC_DIR}/cereal)
|
14 |
+
@@ -206,7 +206,6 @@ if (FL_BUILD_CORE)
|
15 |
+
message(STATUS "Found cereal")
|
16 |
+
target_link_libraries(flashlight PRIVATE cereal)
|
17 |
+
endif()
|
18 |
+
- setup_install_find_module(${CMAKE_MODULE_PATH}/Findcereal.cmake)
|
19 |
+
|
20 |
+
# -------------------- Locate Backend-specific Dependencies --------------------
|
21 |
+
# TODO: rather than conditionally searching for backend-specific dependencies,
|
22 |
+
diff --git a/cmake/flashlightConfig.cmake.in b/cmake/flashlightConfig.cmake.in
|
23 |
+
index 00f9442..f265b8f 100644
|
24 |
+
--- a/cmake/flashlightConfig.cmake.in
|
25 |
+
+++ b/cmake/flashlightConfig.cmake.in
|
26 |
+
@@ -36,6 +36,7 @@ if (@FL_BUILD_LIBRARIES@)
|
27 |
+
endif()
|
28 |
+
# Core dependencies
|
29 |
+
if (@FL_BUILD_CORE@)
|
30 |
+
+ find_dependency(cereal CONFIG)
|
31 |
+
find_dependency(ArrayFire 3.7.1)
|
32 |
+
endif()
|
33 |
+
if (@FL_BUILD_DISTRIBUTED@)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cpu/portfile.cmake
ADDED
@@ -0,0 +1,88 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight")
|
2 |
+
message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda"
|
3 |
+
"can be installed at once. Uninstall and try again:"
|
4 |
+
"\n vcpkg remove flashlight-cuda\n")
|
5 |
+
endif()
|
6 |
+
|
7 |
+
vcpkg_from_github(
|
8 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
9 |
+
REPO flashlight/flashlight
|
10 |
+
REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip
|
11 |
+
SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa
|
12 |
+
HEAD_REF master
|
13 |
+
PATCHES fix-dependencies.patch
|
14 |
+
)
|
15 |
+
|
16 |
+
################################### Build ###################################
|
17 |
+
# Default flags
|
18 |
+
set(FL_DEFAULT_VCPKG_CMAKE_FLAGS
|
19 |
+
-DFL_BUILD_TESTS=OFF
|
20 |
+
-DFL_BUILD_EXAMPLES=OFF
|
21 |
+
-DFL_BACKEND=CPU # this port is CPU-backend only
|
22 |
+
-DFL_BUILD_STANDALONE=OFF
|
23 |
+
)
|
24 |
+
|
25 |
+
# Determine which components to build via specified feature
|
26 |
+
vcpkg_check_features(
|
27 |
+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
28 |
+
FEATURES
|
29 |
+
lib FL_BUILD_LIBRARIES
|
30 |
+
fl FL_BUILD_CORE
|
31 |
+
asr FL_BUILD_APP_ASR
|
32 |
+
imgclass FL_BUILD_APP_IMGCLASS
|
33 |
+
lm FL_BUILD_APP_LM
|
34 |
+
objdet FL_BUILD_APP_OBJDET
|
35 |
+
)
|
36 |
+
|
37 |
+
# Build and install
|
38 |
+
vcpkg_configure_cmake(
|
39 |
+
SOURCE_PATH ${SOURCE_PATH}
|
40 |
+
PREFER_NINJA
|
41 |
+
OPTIONS
|
42 |
+
${FL_DEFAULT_VCPKG_CMAKE_FLAGS}
|
43 |
+
${FEATURE_OPTIONS}
|
44 |
+
OPTIONS_DEBUG
|
45 |
+
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight
|
46 |
+
OPTIONS_RELEASE
|
47 |
+
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
|
48 |
+
)
|
49 |
+
vcpkg_install_cmake()
|
50 |
+
|
51 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight)
|
52 |
+
|
53 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
54 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
55 |
+
|
56 |
+
# Binaries/tools
|
57 |
+
set(FLASHLIGHT_TOOLS "")
|
58 |
+
if ("imgclass" IN_LIST FEATURES)
|
59 |
+
list(APPEND FLASHLIGHT_TOOLS
|
60 |
+
fl_img_imagenet_resnet34
|
61 |
+
fl_img_imagenet_eval
|
62 |
+
fl_img_imagenet_vit
|
63 |
+
)
|
64 |
+
endif()
|
65 |
+
if ("asr" IN_LIST FEATURES)
|
66 |
+
list(APPEND FLASHLIGHT_TOOLS
|
67 |
+
fl_asr_train
|
68 |
+
fl_asr_test
|
69 |
+
fl_asr_decode
|
70 |
+
fl_asr_align
|
71 |
+
fl_asr_voice_activity_detection_ctc
|
72 |
+
fl_asr_arch_benchmark
|
73 |
+
)
|
74 |
+
endif()
|
75 |
+
if ("lm" IN_LIST FEATURES)
|
76 |
+
list(APPEND FLASHLIGHT_TOOLS
|
77 |
+
fl_lm_dictionary_builder
|
78 |
+
fl_lm_train
|
79 |
+
fl_lm_test
|
80 |
+
)
|
81 |
+
endif()
|
82 |
+
list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS)
|
83 |
+
if (NUM_TOOLS GREATER 0)
|
84 |
+
vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN)
|
85 |
+
endif()
|
86 |
+
|
87 |
+
# Copyright
|
88 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cpu/vcpkg.json
ADDED
@@ -0,0 +1,96 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flashlight-cpu",
|
3 |
+
"version": "0.3",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "A C++ standalone library for machine learning. CPU backend.",
|
6 |
+
"homepage": "https://github.com/facebookresearch/flashlight",
|
7 |
+
"supports": "!(windows | osx)",
|
8 |
+
"default-features": [
|
9 |
+
"fl"
|
10 |
+
],
|
11 |
+
"features": {
|
12 |
+
"asr": {
|
13 |
+
"description": "flashlight asr app",
|
14 |
+
"dependencies": [
|
15 |
+
{
|
16 |
+
"name": "flashlight-cpu",
|
17 |
+
"features": [
|
18 |
+
"fl",
|
19 |
+
"lib"
|
20 |
+
]
|
21 |
+
},
|
22 |
+
"gflags",
|
23 |
+
"libsndfile"
|
24 |
+
]
|
25 |
+
},
|
26 |
+
"fl": {
|
27 |
+
"description": "flashlight core autograd and neural net library",
|
28 |
+
"dependencies": [
|
29 |
+
{
|
30 |
+
"name": "arrayfire",
|
31 |
+
"features": [
|
32 |
+
"cpu"
|
33 |
+
]
|
34 |
+
},
|
35 |
+
"cereal",
|
36 |
+
{
|
37 |
+
"name": "gloo",
|
38 |
+
"features": [
|
39 |
+
"mpi"
|
40 |
+
]
|
41 |
+
},
|
42 |
+
"onednn",
|
43 |
+
"openmpi",
|
44 |
+
"stb"
|
45 |
+
]
|
46 |
+
},
|
47 |
+
"imgclass": {
|
48 |
+
"description": "flashlight image classification app",
|
49 |
+
"dependencies": [
|
50 |
+
{
|
51 |
+
"name": "flashlight-cpu",
|
52 |
+
"features": [
|
53 |
+
"fl",
|
54 |
+
"lib"
|
55 |
+
]
|
56 |
+
},
|
57 |
+
"gflags"
|
58 |
+
]
|
59 |
+
},
|
60 |
+
"lib": {
|
61 |
+
"description": "flashlight libraries",
|
62 |
+
"dependencies": [
|
63 |
+
"fftw3",
|
64 |
+
"intel-mkl",
|
65 |
+
"kenlm"
|
66 |
+
]
|
67 |
+
},
|
68 |
+
"lm": {
|
69 |
+
"description": "flashlight lm app",
|
70 |
+
"dependencies": [
|
71 |
+
{
|
72 |
+
"name": "flashlight-cpu",
|
73 |
+
"features": [
|
74 |
+
"fl",
|
75 |
+
"lib"
|
76 |
+
]
|
77 |
+
},
|
78 |
+
"gflags"
|
79 |
+
]
|
80 |
+
},
|
81 |
+
"objdet": {
|
82 |
+
"description": "flashlight object detection app",
|
83 |
+
"dependencies": [
|
84 |
+
{
|
85 |
+
"name": "flashlight-cpu",
|
86 |
+
"features": [
|
87 |
+
"fl",
|
88 |
+
"imgclass",
|
89 |
+
"lib"
|
90 |
+
]
|
91 |
+
},
|
92 |
+
"gflags"
|
93 |
+
]
|
94 |
+
}
|
95 |
+
}
|
96 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cuda/portfile.cmake
ADDED
@@ -0,0 +1,87 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/share/flashlight")
|
2 |
+
message(FATAL_ERROR "Only one of flashlight-cpu and flashlight-cuda"
|
3 |
+
"can be installed at once. Uninstall and try again:"
|
4 |
+
"\n vcpkg remove flashlight-cuda\n")
|
5 |
+
endif()
|
6 |
+
|
7 |
+
vcpkg_from_github(
|
8 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
9 |
+
REPO flashlight/flashlight
|
10 |
+
REF 626914e79073c5547513de649af706f7e2b796ad # 0.3 branch tip
|
11 |
+
SHA512 a22057cfa4cfe7acd95cbc5445a30870cce3cdde89066d1d75f40be0d73b069a49e89b226fe5337488cfe5618dd25958679c0636a3e4008312f01606328becfa
|
12 |
+
HEAD_REF master
|
13 |
+
)
|
14 |
+
|
15 |
+
################################### Build ###################################
|
16 |
+
# Default flags
|
17 |
+
set(FL_DEFAULT_VCPKG_CMAKE_FLAGS
|
18 |
+
-DFL_BUILD_TESTS=OFF
|
19 |
+
-DFL_BUILD_EXAMPLES=OFF
|
20 |
+
-DFL_BACKEND=CUDA # this port is CUDA-backend only
|
21 |
+
-DFL_BUILD_STANDALONE=OFF
|
22 |
+
)
|
23 |
+
|
24 |
+
# Determine which components to build via specified feature
|
25 |
+
vcpkg_check_features(
|
26 |
+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
27 |
+
FEATURES
|
28 |
+
lib FL_BUILD_LIBRARIES
|
29 |
+
fl FL_BUILD_CORE
|
30 |
+
asr FL_BUILD_APP_ASR
|
31 |
+
imgclass FL_BUILD_APP_IMGCLASS
|
32 |
+
lm FL_BUILD_APP_LM
|
33 |
+
objdet FL_BUILD_APP_OBJDET
|
34 |
+
)
|
35 |
+
|
36 |
+
# Build and install
|
37 |
+
vcpkg_configure_cmake(
|
38 |
+
SOURCE_PATH ${SOURCE_PATH}
|
39 |
+
PREFER_NINJA
|
40 |
+
OPTIONS
|
41 |
+
${FL_DEFAULT_VCPKG_CMAKE_FLAGS}
|
42 |
+
${FEATURE_OPTIONS}
|
43 |
+
OPTIONS_DEBUG
|
44 |
+
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight
|
45 |
+
OPTIONS_RELEASE
|
46 |
+
-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight
|
47 |
+
)
|
48 |
+
vcpkg_install_cmake()
|
49 |
+
|
50 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight)
|
51 |
+
|
52 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
53 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
54 |
+
|
55 |
+
# Binaries/tools
|
56 |
+
set(FLASHLIGHT_TOOLS "")
|
57 |
+
if ("imgclass" IN_LIST FEATURES)
|
58 |
+
list(APPEND FLASHLIGHT_TOOLS
|
59 |
+
fl_img_imagenet_resnet34
|
60 |
+
fl_img_imagenet_eval
|
61 |
+
fl_img_imagenet_vit
|
62 |
+
)
|
63 |
+
endif()
|
64 |
+
if ("asr" IN_LIST FEATURES)
|
65 |
+
list(APPEND FLASHLIGHT_TOOLS
|
66 |
+
fl_asr_train
|
67 |
+
fl_asr_test
|
68 |
+
fl_asr_decode
|
69 |
+
fl_asr_align
|
70 |
+
fl_asr_voice_activity_detection_ctc
|
71 |
+
fl_asr_arch_benchmark
|
72 |
+
)
|
73 |
+
endif()
|
74 |
+
if ("lm" IN_LIST FEATURES)
|
75 |
+
list(APPEND FLASHLIGHT_TOOLS
|
76 |
+
fl_lm_dictionary_builder
|
77 |
+
fl_lm_train
|
78 |
+
fl_lm_test
|
79 |
+
)
|
80 |
+
endif()
|
81 |
+
list(LENGTH FLASHLIGHT_TOOLS NUM_TOOLS)
|
82 |
+
if (NUM_TOOLS GREATER 0)
|
83 |
+
vcpkg_copy_tools(TOOL_NAMES ${FLASHLIGHT_TOOLS} AUTO_CLEAN)
|
84 |
+
endif()
|
85 |
+
|
86 |
+
# Copyright
|
87 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flashlight-cuda/vcpkg.json
ADDED
@@ -0,0 +1,94 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flashlight-cuda",
|
3 |
+
"version": "0.3",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "A C++ standalone library for machine learning. CUDA backend.",
|
6 |
+
"homepage": "https://github.com/facebookresearch/flashlight",
|
7 |
+
"supports": "!(windows | osx)",
|
8 |
+
"default-features": [
|
9 |
+
"fl"
|
10 |
+
],
|
11 |
+
"features": {
|
12 |
+
"asr": {
|
13 |
+
"description": "flashlight asr app",
|
14 |
+
"dependencies": [
|
15 |
+
{
|
16 |
+
"name": "flashlight-cuda",
|
17 |
+
"features": [
|
18 |
+
"fl",
|
19 |
+
"lib"
|
20 |
+
]
|
21 |
+
},
|
22 |
+
"gflags",
|
23 |
+
"libsndfile"
|
24 |
+
]
|
25 |
+
},
|
26 |
+
"fl": {
|
27 |
+
"description": "flashlight core autograd and neural net library",
|
28 |
+
"dependencies": [
|
29 |
+
{
|
30 |
+
"name": "arrayfire",
|
31 |
+
"features": [
|
32 |
+
"cuda"
|
33 |
+
]
|
34 |
+
},
|
35 |
+
"cereal",
|
36 |
+
"cuda",
|
37 |
+
"cudnn",
|
38 |
+
"nccl",
|
39 |
+
"openmpi",
|
40 |
+
"stb"
|
41 |
+
]
|
42 |
+
},
|
43 |
+
"imgclass": {
|
44 |
+
"description": "flashlight image classification app",
|
45 |
+
"dependencies": [
|
46 |
+
{
|
47 |
+
"name": "flashlight-cuda",
|
48 |
+
"features": [
|
49 |
+
"fl",
|
50 |
+
"lib"
|
51 |
+
]
|
52 |
+
},
|
53 |
+
"gflags"
|
54 |
+
]
|
55 |
+
},
|
56 |
+
"lib": {
|
57 |
+
"description": "flashlight libraries",
|
58 |
+
"dependencies": [
|
59 |
+
"cub",
|
60 |
+
"cuda",
|
61 |
+
"fftw3",
|
62 |
+
"intel-mkl",
|
63 |
+
"kenlm"
|
64 |
+
]
|
65 |
+
},
|
66 |
+
"lm": {
|
67 |
+
"description": "flashlight lm app",
|
68 |
+
"dependencies": [
|
69 |
+
{
|
70 |
+
"name": "flashlight-cuda",
|
71 |
+
"features": [
|
72 |
+
"fl",
|
73 |
+
"lib"
|
74 |
+
]
|
75 |
+
},
|
76 |
+
"gflags"
|
77 |
+
]
|
78 |
+
},
|
79 |
+
"objdet": {
|
80 |
+
"description": "flashlight object detection app",
|
81 |
+
"dependencies": [
|
82 |
+
{
|
83 |
+
"name": "flashlight-cuda",
|
84 |
+
"features": [
|
85 |
+
"fl",
|
86 |
+
"imgclass",
|
87 |
+
"lib"
|
88 |
+
]
|
89 |
+
},
|
90 |
+
"gflags"
|
91 |
+
]
|
92 |
+
}
|
93 |
+
}
|
94 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/fix-uwp-build.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/util.cpp b/src/util.cpp
|
2 |
+
index 3670a019..fb5d884f 100644
|
3 |
+
--- a/src/util.cpp
|
4 |
+
+++ b/src/util.cpp
|
5 |
+
@@ -255,9 +255,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
|
6 |
+
#ifdef _MSC_VER
|
7 |
+
__pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS
|
8 |
+
#endif
|
9 |
+
+#if _WIN32_WINNT < 0x0A00
|
10 |
+
auto env_str = std::getenv(var_name);
|
11 |
+
if (!env_str) return false;
|
12 |
+
if (_value) *_value = std::string(env_str);
|
13 |
+
+#else
|
14 |
+
+ //There is no support for environment variables in UWP
|
15 |
+
+ var_name; // Do nothing
|
16 |
+
+ *_value = std::string("");
|
17 |
+
+#endif
|
18 |
+
return true;
|
19 |
+
}
|
20 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index ec782239..f163b64d 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -216,7 +216,7 @@ set(FlatBuffers_GRPCTest_SRCS
|
6 |
+
# source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
|
7 |
+
# source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
|
8 |
+
|
9 |
+
-if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
|
10 |
+
+if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN)
|
11 |
+
# do not apply any global settings if the toolchain
|
12 |
+
# is being configured externally
|
13 |
+
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/no-werror.patch
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index ec782239..57566c5a 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -233,13 +233,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
|
6 |
+
"${CMAKE_CXX_FLAGS} -std=c++0x")
|
7 |
+
endif(CYGWIN)
|
8 |
+
set(CMAKE_CXX_FLAGS
|
9 |
+
- "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
|
10 |
+
+ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
|
11 |
+
set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
|
12 |
+
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
|
13 |
+
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
|
14 |
+
set(CMAKE_CXX_FLAGS
|
15 |
+
"${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
|
16 |
+
endif()
|
17 |
+
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
|
18 |
+
+ set(CMAKE_CXX_FLAGS
|
19 |
+
+ "${CMAKE_CXX_FLAGS} -Wextra")
|
20 |
+
+ endif()
|
21 |
+
set(CMAKE_CXX_FLAGS
|
22 |
+
"${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
|
23 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/portfile.cmake
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO google/flatbuffers
|
6 |
+
REF v2.0.0
|
7 |
+
SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
ignore_use_of_cmake_toolchain_file.patch
|
11 |
+
no-werror.patch
|
12 |
+
fix-uwp-build.patch
|
13 |
+
)
|
14 |
+
|
15 |
+
set(options "")
|
16 |
+
if(VCPKG_CROSSCOMPILING)
|
17 |
+
list(APPEND options -DFLATBUFFERS_BUILD_FLATC=OFF -DFLATBUFFERS_BUILD_FLATHASH=OFF)
|
18 |
+
endif()
|
19 |
+
|
20 |
+
vcpkg_cmake_configure(
|
21 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
22 |
+
OPTIONS
|
23 |
+
-DFLATBUFFERS_BUILD_TESTS=OFF
|
24 |
+
-DFLATBUFFERS_BUILD_GRPCTEST=OFF
|
25 |
+
${options}
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_cmake_install()
|
29 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/flatbuffers)
|
30 |
+
vcpkg_fixup_pkgconfig()
|
31 |
+
|
32 |
+
file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*)
|
33 |
+
if(flatc_path)
|
34 |
+
make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
|
35 |
+
get_filename_component(flatc_executable ${flatc_path} NAME)
|
36 |
+
file(
|
37 |
+
RENAME
|
38 |
+
${flatc_path}
|
39 |
+
${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
|
40 |
+
)
|
41 |
+
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
|
42 |
+
else()
|
43 |
+
file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake"
|
44 |
+
"include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n")
|
45 |
+
endif()
|
46 |
+
|
47 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
48 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
49 |
+
|
50 |
+
# Handle copyright
|
51 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flatbuffers/vcpkg.json
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flatbuffers",
|
3 |
+
"version": "2.0.0",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": [
|
6 |
+
"Memory Efficient Serialization Library",
|
7 |
+
"FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
|
8 |
+
],
|
9 |
+
"homepage": "https://google.github.io/flatbuffers/",
|
10 |
+
"dependencies": [
|
11 |
+
{
|
12 |
+
"name": "flatbuffers",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake-config",
|
21 |
+
"host": true
|
22 |
+
}
|
23 |
+
]
|
24 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/fix-cmakelists.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 2616d06..4be28ac 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -34,10 +34,11 @@ find_package(MPFR REQUIRED)
|
6 |
+
if (WITH_NTL)
|
7 |
+
find_package(NTL REQUIRED)
|
8 |
+
endif()
|
9 |
+
-find_package(PythonInterp REQUIRED)
|
10 |
+
|
11 |
+
+if(WITH_CBLAS)
|
12 |
+
find_package(CBLAS)
|
13 |
+
set(FLINT_USES_BLAS ${CBLAS_FOUND})
|
14 |
+
+endif()
|
15 |
+
|
16 |
+
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
17 |
+
set(FLINT_WANT_ASSERT ON)
|
18 |
+
@@ -47,6 +48,8 @@ endif()
|
19 |
+
|
20 |
+
if(MSVC)
|
21 |
+
find_package(PThreads REQUIRED)
|
22 |
+
+ set(PThreads_LIBRARIES ${PThreads4W_LIBRARY})
|
23 |
+
+ set(PThreads_INCLUDE_DIRS ${PThreads4W_INCLUDE_DIR})
|
24 |
+
set(FLINT_USES_PTHREAD ON CACHE BOOL "Use POSIX Threads.")
|
25 |
+
else()
|
26 |
+
option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/portfile.cmake
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(FLINT_VERSION 2.8.0)
|
2 |
+
set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d")
|
3 |
+
|
4 |
+
vcpkg_download_distfile(ARCHIVE
|
5 |
+
URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip"
|
6 |
+
FILENAME "flint-${FLINT_VERSION}.zip"
|
7 |
+
SHA512 ${FLINT_HASH}
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_find_acquire_program(PYTHON3)
|
11 |
+
|
12 |
+
vcpkg_extract_source_archive_ex(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
ARCHIVE ${ARCHIVE}
|
15 |
+
PATCHES
|
16 |
+
fix-cmakelists.patch
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_cmake_configure(
|
20 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
21 |
+
OPTIONS
|
22 |
+
-DPYTHON_EXECUTABLE=${PYTHON3}
|
23 |
+
-DWITH_NTL=OFF
|
24 |
+
-DWITH_CBLAS=OFF
|
25 |
+
)
|
26 |
+
|
27 |
+
vcpkg_cmake_install()
|
28 |
+
|
29 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
30 |
+
|
31 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS)
|
32 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/flint/flint-config.h"
|
33 |
+
"#elif defined(MSC_USE_DLL)" "#elif 1"
|
34 |
+
)
|
35 |
+
endif()
|
36 |
+
|
37 |
+
file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/flint/vcpkg.json
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "flint",
|
3 |
+
"version-semver": "2.8.0",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Fast Library for Number Theory",
|
6 |
+
"homepage": "https://www.flintlib.org/",
|
7 |
+
"supports": "!uwp",
|
8 |
+
"dependencies": [
|
9 |
+
"gettimeofday",
|
10 |
+
"gmp",
|
11 |
+
"mpfr",
|
12 |
+
{
|
13 |
+
"name": "pthreads",
|
14 |
+
"platform": "windows"
|
15 |
+
},
|
16 |
+
{
|
17 |
+
"name": "vcpkg-cmake",
|
18 |
+
"host": true
|
19 |
+
}
|
20 |
+
]
|
21 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/config-path.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
|
2 |
+
index 60b7da1..6831d29 100644
|
3 |
+
--- a/CMake/setup.cmake
|
4 |
+
+++ b/CMake/setup.cmake
|
5 |
+
@@ -65,6 +65,8 @@ else ()
|
6 |
+
set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
|
7 |
+
endif (WIN32 AND NOT CYGWIN)
|
8 |
+
|
9 |
+
+set(FLTK_CONFIG_PATH share/fltk)
|
10 |
+
+
|
11 |
+
include(TestBigEndian)
|
12 |
+
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/findlibsfix.patch
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/resources.cmake b/CMake/resources.cmake
|
2 |
+
index 57173f2..149aa62 100644
|
3 |
+
--- a/CMake/resources.cmake
|
4 |
+
+++ b/CMake/resources.cmake
|
5 |
+
@@ -52,10 +52,8 @@ include (FindPkgConfig)
|
6 |
+
fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
|
7 |
+
fl_find_header (HAVE_DLFCN_H dlfcn.h)
|
8 |
+
fl_find_header (HAVE_GL_GLU_H GL/glu.h)
|
9 |
+
-fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h)
|
10 |
+
fl_find_header (HAVE_LOCALE_H locale.h)
|
11 |
+
fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h)
|
12 |
+
-fl_find_header (HAVE_PNG_H png.h)
|
13 |
+
fl_find_header (HAVE_STDIO_H stdio.h)
|
14 |
+
fl_find_header (HAVE_STRINGS_H strings.h)
|
15 |
+
fl_find_header (HAVE_SYS_SELECT_H sys/select.h)
|
16 |
+
@@ -64,6 +62,17 @@ fl_find_header (HAVE_SYS_STDTYPES_H sys/stdtypes.h)
|
17 |
+
fl_find_header (HAVE_X11_XREGION_H "X11/Xlib.h;X11/Xregion.h")
|
18 |
+
fl_find_header (HAVE_XDBE_H "X11/Xlib.h;X11/extensions/Xdbe.h")
|
19 |
+
|
20 |
+
+find_package(PNG REQUIRED)
|
21 |
+
+if(PNG_FOUND)
|
22 |
+
+ set(LIB_png ${PNG_LIBRARIES})
|
23 |
+
+ set(HAVE_PNG_H ${PNG_FOUND})
|
24 |
+
+
|
25 |
+
+endif()
|
26 |
+
+find_package(ZLIB REQUIRED)
|
27 |
+
+if(ZLIB_FOUND)
|
28 |
+
+ set(LIB_zlib ${ZLIB_LIBRARIES})
|
29 |
+
+endif()
|
30 |
+
+
|
31 |
+
if (WIN32 AND NOT CYGWIN)
|
32 |
+
# we don't use pthreads on Windows (except for Cygwin, see options.cmake)
|
33 |
+
set (HAVE_PTHREAD_H 0)
|
34 |
+
@@ -171,12 +180,10 @@ find_library (LIB_GL GL)
|
35 |
+
find_library (LIB_MesaGL MesaGL)
|
36 |
+
find_library (LIB_GLEW GLEW)
|
37 |
+
find_library (LIB_jpeg jpeg)
|
38 |
+
-find_library (LIB_png png)
|
39 |
+
-find_library (LIB_zlib z)
|
40 |
+
|
41 |
+
mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype)
|
42 |
+
mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW)
|
43 |
+
-mark_as_advanced (LIB_jpeg LIB_png LIB_zlib)
|
44 |
+
+mark_as_advanced (LIB_jpeg)
|
45 |
+
|
46 |
+
#######################################################################
|
47 |
+
# functions
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/fix-system-link.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
2 |
+
index 6fa2fc5..e5ba493 100644
|
3 |
+
--- a/CMake/fl_add_library.cmake
|
4 |
+
+++ b/CMake/fl_add_library.cmake
|
5 |
+
@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
6 |
+
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
7 |
+
|
8 |
+
target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
9 |
+
+
|
10 |
+
+ if (APPLE)
|
11 |
+
+ find_library(Cocoa Cocoa)
|
12 |
+
+ target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
|
13 |
+
+ endif()
|
14 |
+
|
15 |
+
# target properties for all libraries
|
16 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/include.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
2 |
+
index 29baa95..6fa2fc5 100644
|
3 |
+
--- a/CMake/fl_add_library.cmake
|
4 |
+
+++ b/CMake/fl_add_library.cmake
|
5 |
+
@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
6 |
+
endif (MSVC)
|
7 |
+
|
8 |
+
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
9 |
+
+
|
10 |
+
+ target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
11 |
+
|
12 |
+
# target properties for all libraries
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/portfile.cmake
ADDED
@@ -0,0 +1,75 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# FLTK has many improperly shared global variables that get duplicated into every DLL
|
2 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
3 |
+
|
4 |
+
vcpkg_from_github(
|
5 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
6 |
+
REPO fltk/fltk
|
7 |
+
REF release-1.3.8
|
8 |
+
SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3
|
9 |
+
PATCHES
|
10 |
+
findlibsfix.patch
|
11 |
+
config-path.patch
|
12 |
+
include.patch
|
13 |
+
fix-system-link.patch
|
14 |
+
)
|
15 |
+
|
16 |
+
if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
|
17 |
+
set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")
|
18 |
+
else()
|
19 |
+
set(OPTION_USE_GL "-DOPTION_USE_GL=ON")
|
20 |
+
endif()
|
21 |
+
|
22 |
+
vcpkg_cmake_configure(
|
23 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
24 |
+
OPTIONS
|
25 |
+
-DFLTK_BUILD_TEST=OFF
|
26 |
+
-DOPTION_LARGE_FILE=ON
|
27 |
+
-DOPTION_USE_THREADS=ON
|
28 |
+
-DOPTION_USE_SYSTEM_ZLIB=ON
|
29 |
+
-DOPTION_USE_SYSTEM_LIBPNG=ON
|
30 |
+
-DOPTION_USE_SYSTEM_LIBJPEG=ON
|
31 |
+
-DOPTION_BUILD_SHARED_LIBS=OFF
|
32 |
+
-DFLTK_CONFIG_PATH=share/fltk
|
33 |
+
${OPTION_USE_GL}
|
34 |
+
)
|
35 |
+
|
36 |
+
vcpkg_cmake_install()
|
37 |
+
|
38 |
+
vcpkg_cmake_config_fixup()
|
39 |
+
|
40 |
+
vcpkg_copy_pdbs()
|
41 |
+
|
42 |
+
if(VCPKG_TARGET_IS_OSX)
|
43 |
+
vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN)
|
44 |
+
elseif(VCPKG_TARGET_IS_WINDOWS)
|
45 |
+
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config")
|
46 |
+
vcpkg_copy_tools(TOOL_NAMES fluid AUTO_CLEAN)
|
47 |
+
else()
|
48 |
+
vcpkg_copy_tools(TOOL_NAMES fluid fltk-config AUTO_CLEAN)
|
49 |
+
endif()
|
50 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config")
|
51 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
|
52 |
+
endif()
|
53 |
+
|
54 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
55 |
+
file(REMOVE_RECURSE
|
56 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
57 |
+
"${CURRENT_PACKAGES_DIR}/bin"
|
58 |
+
)
|
59 |
+
endif()
|
60 |
+
file(REMOVE_RECURSE
|
61 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
62 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
63 |
+
)
|
64 |
+
|
65 |
+
foreach(FILE Fl_Export.H fl_utf8.h)
|
66 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
67 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "0")
|
68 |
+
else()
|
69 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "1")
|
70 |
+
endif()
|
71 |
+
endforeach()
|
72 |
+
|
73 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fltk/UseFLTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel;${SOURCE_PATH}" [[${CMAKE_CURRENT_LIST_DIR}/../../include]])
|
74 |
+
|
75 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fltk/vcpkg.json
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fltk",
|
3 |
+
"version": "1.3.8",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
|
6 |
+
"homepage": "https://www.fltk.org/",
|
7 |
+
"supports": "!uwp",
|
8 |
+
"dependencies": [
|
9 |
+
"libjpeg-turbo",
|
10 |
+
"libpng",
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake-config",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
"zlib"
|
20 |
+
]
|
21 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidlite/portfile.cmake
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(EXISTS "${CURRENT_INSTALLED_DIR}/include/fluidsynth/settings.h")
|
2 |
+
message(FATAL_ERROR "Can't build fluidlite if fluidsynth is installed. Please remove fluidsynth, and try to install fluidlite again if you need it.")
|
3 |
+
endif()
|
4 |
+
|
5 |
+
vcpkg_from_github(
|
6 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
7 |
+
REPO divideconcept/FluidLite
|
8 |
+
REF fdd05bad03cdb24d1f78b5fe3453842890c1b0e8
|
9 |
+
SHA512 8118bec2cb5ee48b8064ed2111610f1917ee8e6f1dc213121b2311d056da21d7f618ef50735e7653d2cccf1e96652f3ccf026101fccb9863448008918add53e0
|
10 |
+
HEAD_REF master
|
11 |
+
)
|
12 |
+
|
13 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLUIDLITE_BUILD_STATIC)
|
14 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLUIDLITE_BUILD_SHARED)
|
15 |
+
|
16 |
+
vcpkg_configure_cmake(
|
17 |
+
SOURCE_PATH ${SOURCE_PATH}
|
18 |
+
PREFER_NINJA
|
19 |
+
OPTIONS
|
20 |
+
-DFLUIDLITE_BUILD_STATIC=${FLUIDLITE_BUILD_STATIC}
|
21 |
+
-DFLUIDLITE_BUILD_SHARED=${FLUIDLITE_BUILD_SHARED}
|
22 |
+
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
|
23 |
+
)
|
24 |
+
|
25 |
+
vcpkg_install_cmake()
|
26 |
+
|
27 |
+
# Remove unnecessary files
|
28 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
29 |
+
|
30 |
+
# Handle copyright
|
31 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
32 |
+
|
33 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidlite/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fluidlite",
|
3 |
+
"version-string": "2020-08-27",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.",
|
6 |
+
"homepage": "https://github.com/divideconcept/FluidLite"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/fix-dependencies.patch
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index e4ea71c..df37028 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -517,8 +517,9 @@ else(NOT enable-pkgconfig)
|
6 |
+
find_package ( PkgConfig REQUIRED )
|
7 |
+
|
8 |
+
# Mandatory libraries: glib and gthread
|
9 |
+
- pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 )
|
10 |
+
+ pkg_check_modules ( GLIB IMPORTED_TARGET REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 )
|
11 |
+
list( APPEND PC_REQUIRES_PRIV "glib-2.0" "gthread-2.0")
|
12 |
+
+ set(GLIB_LIBRARIES PkgConfig::GLIB)
|
13 |
+
|
14 |
+
if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" )
|
15 |
+
message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" )
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/portfile.cmake
ADDED
@@ -0,0 +1,68 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO FluidSynth/fluidsynth
|
4 |
+
REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6
|
5 |
+
SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
fix-dependencies.patch
|
9 |
+
separate-gentables.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
if ("buildtools" IN_LIST FEATURES)
|
13 |
+
vcpkg_cmake_configure(
|
14 |
+
SOURCE_PATH "${SOURCE_PATH}/src/gentables"
|
15 |
+
LOGFILE_BASE configure-tools
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_build(
|
19 |
+
LOGFILE_BASE install-tools
|
20 |
+
TARGET install
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_copy_tools(TOOL_NAMES make_tables AUTO_CLEAN)
|
24 |
+
|
25 |
+
vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
26 |
+
endif()
|
27 |
+
|
28 |
+
set(feature_list dbus jack libinstpatch libsndfile midishare opensles oboe oss sdl2 pulseaudio readline lash alsa systemd coreaudio coremidi dart)
|
29 |
+
vcpkg_list(SET FEATURE_OPTIONS)
|
30 |
+
foreach(_feature IN LISTS feature_list)
|
31 |
+
list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF)
|
32 |
+
endforeach()
|
33 |
+
|
34 |
+
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
|
35 |
+
|
36 |
+
vcpkg_find_acquire_program(PKGCONFIG)
|
37 |
+
vcpkg_cmake_configure(
|
38 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
39 |
+
OPTIONS
|
40 |
+
${FEATURE_OPTIONS}
|
41 |
+
-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}
|
42 |
+
-DLIB_INSTALL_DIR=lib
|
43 |
+
-Denable-pkgconfig=ON
|
44 |
+
-Denable-framework=OFF # Needs system permission to install framework
|
45 |
+
OPTIONS_DEBUG
|
46 |
+
-Denable-debug:BOOL=ON
|
47 |
+
MAYBE_UNUSED_VARIABLES
|
48 |
+
enable-coreaudio
|
49 |
+
enable-coremidi
|
50 |
+
enable-dart
|
51 |
+
)
|
52 |
+
|
53 |
+
vcpkg_cmake_install()
|
54 |
+
vcpkg_fixup_pkgconfig()
|
55 |
+
|
56 |
+
# Copy fluidsynth.exe to tools dir
|
57 |
+
vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN)
|
58 |
+
|
59 |
+
# Remove unnecessary files
|
60 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
61 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
62 |
+
|
63 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
64 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
65 |
+
endif()
|
66 |
+
|
67 |
+
# Handle copyright
|
68 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/separate-gentables.patch
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2 |
+
index e913cb2..570207e 100644
|
3 |
+
--- a/src/CMakeLists.txt
|
4 |
+
+++ b/src/CMakeLists.txt
|
5 |
+
@@ -268,6 +268,9 @@ generate_product_version(
|
6 |
+
)
|
7 |
+
endif ( WIN32 )
|
8 |
+
|
9 |
+
+find_program(GENTABLES make_tables REQUIRED)
|
10 |
+
+execute_process(COMMAND ${GENTABLES} "${CMAKE_BINARY_DIR}/")
|
11 |
+
+
|
12 |
+
add_library ( libfluidsynth-OBJ OBJECT
|
13 |
+
${config_SOURCES}
|
14 |
+
${fluid_alsa_SOURCES}
|
15 |
+
@@ -413,6 +416,7 @@ else ( MACOSX_FRAMEWORK )
|
16 |
+
install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} )
|
17 |
+
endif ( MACOSX_FRAMEWORK )
|
18 |
+
|
19 |
+
+if (0)
|
20 |
+
# ******* Auto Generated Lookup Tables ******
|
21 |
+
|
22 |
+
include(ExternalProject)
|
23 |
+
@@ -435,3 +439,4 @@ ExternalProject_Add(gentables
|
24 |
+
INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/"
|
25 |
+
)
|
26 |
+
add_dependencies(libfluidsynth-OBJ gentables)
|
27 |
+
+endif()
|
28 |
+
diff --git a/src/gentables/CMakeLists.txt b/src/gentables/CMakeLists.txt
|
29 |
+
index 638f299..e834e34 100644
|
30 |
+
--- a/src/gentables/CMakeLists.txt
|
31 |
+
+++ b/src/gentables/CMakeLists.txt
|
32 |
+
@@ -15,7 +15,6 @@ project (gentables C)
|
33 |
+
set ( CMAKE_BUILD_TYPE Debug )
|
34 |
+
|
35 |
+
# hardcode ".exe" as suffix to the binary, else in case of cross-platform cross-compiling the calling cmake will not know the suffix used here and fail to find the binary
|
36 |
+
-set ( CMAKE_EXECUTABLE_SUFFIX ".exe" )
|
37 |
+
|
38 |
+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
39 |
+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
|
40 |
+
@@ -34,3 +33,5 @@ if ( WIN32 )
|
41 |
+
else ( WIN32 )
|
42 |
+
target_link_libraries (make_tables "m")
|
43 |
+
endif ()
|
44 |
+
+
|
45 |
+
+install(TARGETS make_tables DESTINATION bin)
|
46 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fluidsynth/vcpkg.json
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fluidsynth",
|
3 |
+
"version": "2.2.6",
|
4 |
+
"description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.",
|
5 |
+
"homepage": "https://github.com/FluidSynth/fluidsynth",
|
6 |
+
"license": "LGPL-2.1-or-later",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "fluidsynth",
|
10 |
+
"host": true,
|
11 |
+
"features": [
|
12 |
+
"buildtools"
|
13 |
+
]
|
14 |
+
},
|
15 |
+
"glib",
|
16 |
+
{
|
17 |
+
"name": "vcpkg-cmake",
|
18 |
+
"host": true
|
19 |
+
}
|
20 |
+
],
|
21 |
+
"features": {
|
22 |
+
"buildtools": {
|
23 |
+
"description": "Build tools gentables"
|
24 |
+
}
|
25 |
+
}
|
26 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmem/portfile.cmake
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO c-libs/fmem
|
4 |
+
REF 2ccee3d2fb2fc72370a9bb2131bfc9167e0d9022
|
5 |
+
SHA512 4a63332eb5df7f30bdad9e4233171b5c21dd2b092e525e9dcc4f602295ffff50c555c80fd74d964bc3daeffd8001a9b852f1769ef3161259dd8a3cae3ca3a4df
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_configure_cmake(
|
10 |
+
SOURCE_PATH ${SOURCE_PATH}
|
11 |
+
PREFER_NINJA
|
12 |
+
OPTIONS
|
13 |
+
-DBUILD_TESTING=OFF
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_install_cmake()
|
17 |
+
|
18 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
19 |
+
|
20 |
+
vcpkg_copy_pdbs()
|
21 |
+
|
22 |
+
# Handle copyright
|
23 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmem/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fmem",
|
3 |
+
"version-string": "c-libs-2ccee3d2fb",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A cross-platform library for opening memory-backed libc streams."
|
6 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmi4cpp/portfile.cmake
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO NTNU-IHB/FMI4cpp
|
4 |
+
REF 0.8.0
|
5 |
+
SHA512 547f61dfbd57593ff8839fbed3f8a5624551ee4be5e0dd7773384a869086af8a4483cfe17dc087e3f03c9ea2038b537c8c4998a405687c1a353d08e52dac411e
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
OPTIONS
|
12 |
+
-DFMI4CPP_BUILD_TESTS=OFF
|
13 |
+
-DFMI4CPP_BUILD_EXAMPLES=OFF
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_cmake_install()
|
17 |
+
vcpkg_cmake_config_fixup()
|
18 |
+
|
19 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
20 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
21 |
+
|
22 |
+
vcpkg_copy_pdbs()
|
23 |
+
|
24 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmi4cpp/vcpkg.json
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fmi4cpp",
|
3 |
+
"version": "0.8.0",
|
4 |
+
"description": "FMI 2.0 implementation written in modern C++",
|
5 |
+
"homepage": "https://github.com/NTNU-IHB/FMI4cpp",
|
6 |
+
"dependencies": [
|
7 |
+
"boost-property-tree",
|
8 |
+
{
|
9 |
+
"name": "libzip",
|
10 |
+
"features": [
|
11 |
+
"openssl"
|
12 |
+
]
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
{
|
19 |
+
"name": "vcpkg-cmake-config",
|
20 |
+
"host": true
|
21 |
+
}
|
22 |
+
]
|
23 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/0001-remove-install-prefix.patch
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 04bb359c724308e30268840c64932ea1d05b9077 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Nicole Mazzuca <[email protected]>
|
3 |
+
Date: Wed, 23 Sep 2020 10:00:23 -0700
|
4 |
+
Subject: [PATCH 1/2] remove install prefix
|
5 |
+
|
6 |
+
---
|
7 |
+
CMakeLists.txt | 4 ----
|
8 |
+
1 file changed, 4 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
11 |
+
index f7372bf..f3c11f1 100644
|
12 |
+
--- a/CMakeLists.txt
|
13 |
+
+++ b/CMakeLists.txt
|
14 |
+
@@ -26,7 +26,6 @@ set(FMILIBRARYHOME ${FMILibrary_SOURCE_DIR})
|
15 |
+
set(FMILIBRARYBUILD ${FMILibrary_BINARY_DIR})
|
16 |
+
|
17 |
+
# User configuration options and parameters
|
18 |
+
-SET(FMILIB_INSTALL_PREFIX ${FMILibrary_BINARY_DIR}/../install CACHE PATH "Prefix prepended to install directories")
|
19 |
+
set(FMILIB_THIRDPARTYLIBS ${FMILibrary_SOURCE_DIR}/ThirdParty CACHE PATH "Path to the ThirdParty library dir" )
|
20 |
+
set(FMILIB_FMI_STANDARD_HEADERS ${FMILIB_THIRDPARTYLIBS}/FMI/default CACHE PATH "Path to the FMI standard headers dir" )
|
21 |
+
|
22 |
+
@@ -84,7 +83,6 @@ IF(NOT CMAKE_BUILD_TYPE)
|
23 |
+
SET(CMAKE_BUILD_TYPE ${FMILIB_DEFAULT_BUILD_TYPE})
|
24 |
+
ENDIF(NOT CMAKE_BUILD_TYPE)
|
25 |
+
|
26 |
+
-SET(CMAKE_INSTALL_PREFIX ${FMILIB_INSTALL_PREFIX} CACHE INTERNAL "Prefix prepended to install directories" FORCE)
|
27 |
+
|
28 |
+
# debug_message is used to trace the build script
|
29 |
+
function(debug_message)
|
30 |
+
@@ -350,7 +348,6 @@ endfunction()
|
31 |
+
|
32 |
+
if(FMILIB_GENERATE_DOXYGEN_DOC)
|
33 |
+
|
34 |
+
- file(MAKE_DIRECTORY "${FMILIB_INSTALL_PREFIX}/doc")
|
35 |
+
|
36 |
+
set(DOXYFILE_IN ${FMILIBRARYHOME}/Config.cmake/fmilib_doxydoc.conf CACHE INTERNAL "Doxygen config file")
|
37 |
+
set(DOXYFILE_IMAGE_DIR "${FMILIBRARYHOME}/images" CACHE INTERNAL "Doxygen images" FORCE)
|
38 |
+
@@ -372,7 +369,6 @@ if(FMILIB_GENERATE_DOXYGEN_DOC)
|
39 |
+
set(DOXYFILE_SOURCE_DIR "${FMILIBRARYBUILD}/doc" CACHE INTERNAL "Doxygen default source dir" FORCE)
|
40 |
+
set(DOXYFILE_EXTRA_SOURCES "${DOXYFILE_EXTRA_SOURCES} \"${FMILIBRARYHOME}/Test\"")
|
41 |
+
|
42 |
+
- set(DOXYFILE_OUTPUT_DIR "${FMILIB_INSTALL_PREFIX}/doc")
|
43 |
+
|
44 |
+
set(DOXYFILE_STRIP_FROM_PATH "${FMILIBRARYHOME}")
|
45 |
+
|
46 |
+
--
|
47 |
+
2.24.3 (Apple Git-128)
|
48 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/0002-include-sys-stat.h-for-mkdir.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 080876bf3735efeedaab0b211d2be7b3c3524d97 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Nicole Mazzuca <[email protected]>
|
3 |
+
Date: Wed, 23 Sep 2020 10:03:30 -0700
|
4 |
+
Subject: [PATCH 2/2] include sys/stat.h for mkdir
|
5 |
+
|
6 |
+
---
|
7 |
+
ThirdParty/Minizip/minizip/miniunz.c | 3 ++-
|
8 |
+
1 file changed, 2 insertions(+), 1 deletion(-)
|
9 |
+
|
10 |
+
diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c
|
11 |
+
index 2264705..e0167d5 100644
|
12 |
+
--- a/ThirdParty/Minizip/minizip/miniunz.c
|
13 |
+
+++ b/ThirdParty/Minizip/minizip/miniunz.c
|
14 |
+
@@ -53,5 +53,6 @@
|
15 |
+
#else
|
16 |
+
# include <unistd.h>
|
17 |
+
# include <utime.h>
|
18 |
+
+# include <sys/stat.h>
|
19 |
+
#endif
|
20 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/portfile.cmake
ADDED
@@ -0,0 +1,67 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_download_distfile(ARCHIVE
|
4 |
+
URLS "https://jmodelica.org/fmil/FMILibrary-2.0.3-src.zip"
|
5 |
+
FILENAME "FMILibrary-2.0.3-src.zip"
|
6 |
+
SHA512 86e4b5019d8f2a76b01141411845d977fb3949617604de0b34351f23647e3e8b378477de184e1c4f2f59297bc4c7de3155e0edba9099b8924594a36b37b04cc8
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_extract_source_archive_ex(
|
10 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
11 |
+
ARCHIVE ${ARCHIVE}
|
12 |
+
PATCHES
|
13 |
+
0001-remove-install-prefix.patch
|
14 |
+
0002-include-sys-stat.h-for-mkdir.patch
|
15 |
+
)
|
16 |
+
|
17 |
+
# Note that if you have configured and built both static and shared library on Windows
|
18 |
+
# but want to link with the static library compile time define "FMILIB_BUILDING_LIBRARY" must be set.
|
19 |
+
if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
20 |
+
SET(FMILIB_BUILDING_LIBRARY ON)
|
21 |
+
else()
|
22 |
+
SET(FMILIB_BUILDING_LIBRARY OFF)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
# Use static run-time libraries (/MT or /MTd code generation flags)
|
26 |
+
# This is only used when generating Microsoft Visual Studio solutions. If the options is on then the library will
|
27 |
+
# be built against static runtime, otherwise - dynamic runtime (/MD or /MDd). Make sure the client code is using
|
28 |
+
# matching runtime
|
29 |
+
if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_CRT_LINKAGE STREQUAL static)
|
30 |
+
SET(FMILIB_BUILD_WITH_STATIC_RTLIB ON)
|
31 |
+
else()
|
32 |
+
SET(FMILIB_BUILD_WITH_STATIC_RTLIB OFF)
|
33 |
+
endif()
|
34 |
+
|
35 |
+
# On LINUX position independent code (-fPIC) must be used on all files to be linked into a shared library (.so file).
|
36 |
+
# On other systems this is not needed (either is default or relocation is done). Set this option to OFF if you
|
37 |
+
# are building an application on Linux and use static library only
|
38 |
+
if ((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
39 |
+
SET(FMILIB_BUILD_FOR_SHARED_LIBS OFF)
|
40 |
+
else()
|
41 |
+
SET(FMILIB_BUILD_FOR_SHARED_LIBS ON)
|
42 |
+
endif()
|
43 |
+
|
44 |
+
# Only build the requested library
|
45 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
46 |
+
SET(FMILIB_BUILD_STATIC_LIB ON)
|
47 |
+
SET(FMILIB_BUILD_SHARED_LIB OFF)
|
48 |
+
else()
|
49 |
+
SET(FMILIB_BUILD_STATIC_LIB OFF)
|
50 |
+
SET(FMILIB_BUILD_SHARED_LIB ON)
|
51 |
+
endif()
|
52 |
+
|
53 |
+
vcpkg_configure_cmake(
|
54 |
+
SOURCE_PATH ${SOURCE_PATH}
|
55 |
+
PREFER_NINJA
|
56 |
+
OPTIONS
|
57 |
+
-DFMILIB_BUILD_TESTS=OFF
|
58 |
+
-DFMILIB_BUILD_STATIC_LIB=${FMILIB_BUILD_STATIC_LIB}
|
59 |
+
-DFMILIB_BUILD_SHARED_LIB=${FMILIB_BUILD_SHARED_LIB}
|
60 |
+
-DFMILIB_BUILDING_LIBRARY=${FMILIB_BUILDING_LIBRARY}
|
61 |
+
-DFMILIB_BUILD_WITH_STATIC_RTLIB=${FMILIB_BUILD_WITH_STATIC_RTLIB}
|
62 |
+
)
|
63 |
+
|
64 |
+
vcpkg_install_cmake()
|
65 |
+
vcpkg_copy_pdbs()
|
66 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
67 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmilib/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fmilib",
|
3 |
+
"version-string": "2.0.3",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.",
|
6 |
+
"homepage": "https://www.fmi-standard.org/"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/fix-invalid-command.patch
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/include/fmt/locale.h b/include/fmt/locale.h
|
2 |
+
index 7571b52..0a34eb4 100644
|
3 |
+
--- a/include/fmt/locale.h
|
4 |
+
+++ b/include/fmt/locale.h
|
5 |
+
@@ -1,2 +1,6 @@
|
6 |
+
#include "xchar.h"
|
7 |
+
+#ifdef _WIN32
|
8 |
+
+#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead")
|
9 |
+
+#else
|
10 |
+
#warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead
|
11 |
+
+#endif
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/fix-write-batch.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index f21cf45..691a632 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -157,7 +157,7 @@ if (MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
|
6 |
+
join(netfxpath
|
7 |
+
"C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
|
8 |
+
".NETFramework\\v4.0")
|
9 |
+
- file(WRITE run-msbuild.bat "
|
10 |
+
+ file(WRITE ${CMAKE_BINARY_DIR}/run-msbuild.bat "
|
11 |
+
${MSBUILD_SETUP}
|
12 |
+
${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
|
13 |
+
endif ()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/portfile.cmake
ADDED
@@ -0,0 +1,66 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO fmtlib/fmt
|
4 |
+
REF 8.1.1
|
5 |
+
SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
fix-write-batch.patch
|
9 |
+
fix-invalid-command.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
vcpkg_cmake_configure(
|
13 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
14 |
+
OPTIONS
|
15 |
+
-DFMT_CMAKE_DIR=share/fmt
|
16 |
+
-DFMT_TEST=OFF
|
17 |
+
-DFMT_DOC=OFF
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_cmake_install()
|
21 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
22 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
23 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
24 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
25 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll")
|
26 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
|
27 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll")
|
28 |
+
endif()
|
29 |
+
endif()
|
30 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
31 |
+
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll")
|
32 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
|
33 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll")
|
34 |
+
endif()
|
35 |
+
endif()
|
36 |
+
endif()
|
37 |
+
|
38 |
+
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fmt/core.h
|
39 |
+
"defined(FMT_SHARED)"
|
40 |
+
"1"
|
41 |
+
)
|
42 |
+
endif()
|
43 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
44 |
+
|
45 |
+
vcpkg_cmake_config_fixup()
|
46 |
+
vcpkg_fixup_pkgconfig()
|
47 |
+
|
48 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
49 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
50 |
+
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake
|
51 |
+
"lib/fmtd.dll"
|
52 |
+
"bin/fmtd.dll"
|
53 |
+
)
|
54 |
+
endif()
|
55 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
56 |
+
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake
|
57 |
+
"lib/fmt.dll"
|
58 |
+
"bin/fmt.dll"
|
59 |
+
)
|
60 |
+
endif()
|
61 |
+
endif()
|
62 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
63 |
+
|
64 |
+
# Handle post-build CMake instructions
|
65 |
+
vcpkg_copy_pdbs()
|
66 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/usage
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package fmt provides CMake targets:
|
2 |
+
|
3 |
+
find_package(fmt CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE fmt::fmt)
|
5 |
+
|
6 |
+
# Or use the header-only version
|
7 |
+
find_package(fmt CONFIG REQUIRED)
|
8 |
+
target_link_libraries(main PRIVATE fmt::fmt-header-only)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/fmt/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "fmt",
|
3 |
+
"version": "8.1.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
|
6 |
+
"homepage": "https://github.com/fmtlib/fmt",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/folly/boost-1.70.patch
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
|
2 |
+
index 2126ec0..ef82ade 100644
|
3 |
+
--- a/folly/portability/PThread.cpp
|
4 |
+
+++ b/folly/portability/PThread.cpp
|
5 |
+
@@ -20,6 +20,8 @@
|
6 |
+
#include <boost/thread/exceptions.hpp>
|
7 |
+
#include <boost/thread/tss.hpp>
|
8 |
+
#include <boost/version.hpp>
|
9 |
+
+#include <boost/shared_ptr.hpp>
|
10 |
+
+#include <boost/thread/thread_only.hpp>
|
11 |
+
|
12 |
+
#include <errno.h>
|
13 |
+
|
14 |
+
@@ -691,7 +693,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
|
15 |
+
boost::detail::thread::cleanup_caller_t(),
|
16 |
+
boost::detail::thread::cleanup_func_t(),
|
17 |
+
#else
|
18 |
+
- boost::shared_ptr<boost::detail::tss_cleanup_function>(),
|
19 |
+
+ 0,0,
|
20 |
+
#endif
|
21 |
+
const_cast<void*>(value),
|
22 |
+
false);
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/folly/disable-non-underscore-posix-names.patch
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
|
2 |
+
index 86fd0f9..ccad11e 100644
|
3 |
+
--- a/folly/portability/Windows.h
|
4 |
+
+++ b/folly/portability/Windows.h
|
5 |
+
@@ -32,24 +32,17 @@
|
6 |
+
// disabled to ensure all of the normal names get declared properly.
|
7 |
+
#include <stdio.h>
|
8 |
+
|
9 |
+
-#ifndef __STDC__
|
10 |
+
-/* nolint */
|
11 |
+
-#define __STDC__ 1
|
12 |
+
#pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES")
|
13 |
+
#ifdef _CRT_DECLARE_NONSTDC_NAMES
|
14 |
+
#undef _CRT_DECLARE_NONSTDC_NAMES
|
15 |
+
#endif
|
16 |
+
+
|
17 |
+
+#include <corecrt.h>
|
18 |
+
#pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
|
19 |
+
-#undef _CRT_INTERNAL_NONSTDC_NAMES
|
20 |
+
-#include <direct.h> // @manual nolint
|
21 |
+
-#include <io.h> // @manual nolint
|
22 |
+
-#undef __STDC__
|
23 |
+
+#define _CRT_INTERNAL_NONSTDC_NAMES 0
|
24 |
+
+#include <direct.h>
|
25 |
+
+#include <io.h>
|
26 |
+
#pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
|
27 |
+
-#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")
|
28 |
+
-#else
|
29 |
+
-#include <direct.h> // @manual nolint
|
30 |
+
-#include <io.h> // @manual nolint
|
31 |
+
-#endif
|
32 |
+
|
33 |
+
#if defined(min) || defined(max)
|
34 |
+
#error Windows.h needs to be included by this header, or else NOMINMAX needs \
|