Spaces:
Sleeping
Sleeping
471c1f8f15597f56d47281bf51eeda04ea8357cbaeaee51311ec93c261df215f
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/cmake-fix.patch +515 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/portfile.cmake +42 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/vcpkg.json +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/LICENSE +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/portfile.cmake +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/vcpkg.json +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/CMakeLists.txt +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/missing_header.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/portfile.cmake +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/vcpkg.json +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/byte-lite/portfile.cmake +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/byte-lite/vcpkg.json +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/CMakeLists.txt +45 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/bzip2.pc.in +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/fix-import-export-macros.patch +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/portfile.cmake +50 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/avoid-docs.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/portfile.cmake +44 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/vcpkg.json +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-dbg-macro/portfile.cmake +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-dbg-macro/vcpkg.json +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c4core/portfile.cmake +88 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c4core/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c89stringutils/portfile.cmake +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/c89stringutils/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caf/fix_dependency.patch +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caf/portfile.cmake +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caf/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/fix-protobuf-deprecated.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/fix-space.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/msvc-fixes.patch +396 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/no-inout-macros.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/portfile.cmake +101 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/vcpkg.json +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/cairo_static_fix.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/disable-atomic-ops-check.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/portfile.cmake +90 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/vcpkg.json +48 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/build-support-msvc2022.diff +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/portfile.cmake +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/vcpkg.json +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/calceph/portfile.cmake +50 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/calceph/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/camport3/portfile.cmake +73 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/camport3/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/capnproto/portfile.cmake +37 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/capnproto/vcpkg.json +27 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/cmake-fix.patch
ADDED
@@ -0,0 +1,515 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/BulletConfig.cmake.in b/BulletConfig.cmake.in
|
2 |
+
index f5dc7bd..50b3d67 100644
|
3 |
+
--- a/BulletConfig.cmake.in
|
4 |
+
+++ b/BulletConfig.cmake.in
|
5 |
+
@@ -13,13 +13,23 @@
|
6 |
+
# BULLET_LIBRARY_DIRS - List of directories containing Bullet' libraries
|
7 |
+
# BULLET_ROOT_DIR - The base directory of Bullet
|
8 |
+
# BULLET_VERSION_STRING - A human-readable string containing the version
|
9 |
+
-
|
10 |
+
+@PACKAGE_INIT@
|
11 |
+
set ( BULLET_FOUND 1 )
|
12 |
+
-set ( BULLET_USE_FILE "@BULLET_USE_FILE@" )
|
13 |
+
+set_and_check ( BULLET_USE_FILE "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/UseBullet.cmake" )
|
14 |
+
set ( BULLET_DEFINITIONS "@BULLET_DEFINITIONS@" )
|
15 |
+
-set ( BULLET_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" )
|
16 |
+
-set ( BULLET_INCLUDE_DIRS "@INCLUDE_INSTALL_DIR@" )
|
17 |
+
+set_and_check ( BULLET_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" )
|
18 |
+
+set_and_check ( BULLET_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@" )
|
19 |
+
set ( BULLET_LIBRARIES "@BULLET_LIBRARIES@" )
|
20 |
+
-set ( BULLET_LIBRARY_DIRS "@LIB_DESTINATION@" )
|
21 |
+
-set ( BULLET_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" )
|
22 |
+
-set ( BULLET_VERSION_STRING "@BULLET_VERSION@" )
|
23 |
+
|
24 |
+
+set_and_check ( BULLET_LIBRARY_DIRS "@PACKAGE_LIB_DESTINATION@" )
|
25 |
+
+set_and_check ( BULLET_ROOT_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@" )
|
26 |
+
+set ( BULLET_VERSION_STRING "@BULLET_VERSION@" )
|
27 |
+
+# Load targets
|
28 |
+
+if(NOT TARGET Bullet3Common)
|
29 |
+
+ #
|
30 |
+
+ include("@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/LinearMathTargets.cmake")
|
31 |
+
+ file(GLOB CONFIG_FILES "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/*Targets.cmake")
|
32 |
+
+ foreach(f IN LISTS CONFIG_FILES)
|
33 |
+
+ include(${f})
|
34 |
+
+ endforeach()
|
35 |
+
+ set(_DIR)
|
36 |
+
+endif()
|
37 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
38 |
+
index a695b71..607edde 100644
|
39 |
+
--- a/CMakeLists.txt
|
40 |
+
+++ b/CMakeLists.txt
|
41 |
+
@@ -1,4 +1,4 @@
|
42 |
+
-cmake_minimum_required(VERSION 2.4.3)
|
43 |
+
+cmake_minimum_required(VERSION 3.0)
|
44 |
+
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
45 |
+
cmake_policy(SET CMP0017 NEW)
|
46 |
+
#this line has to appear before 'PROJECT' in order to be able to disable incremental linking
|
47 |
+
@@ -489,7 +489,14 @@ IF (BUILD_UNIT_TESTS)
|
48 |
+
SUBDIRS(test)
|
49 |
+
ENDIF()
|
50 |
+
|
51 |
+
-set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
|
52 |
+
+include(CMakePackageConfigHelpers)
|
53 |
+
+write_basic_package_version_file(
|
54 |
+
+ "${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake"
|
55 |
+
+ VERSION ${BULLET_VERSION}
|
56 |
+
+ COMPATIBILITY AnyNewerVersion
|
57 |
+
+)
|
58 |
+
+
|
59 |
+
+set (BULLET_CONFIG_CMAKE_PATH share/bullet )
|
60 |
+
list (APPEND BULLET_DEFINITIONS ${BULLET_DOUBLE_DEF})
|
61 |
+
list (APPEND BULLET_LIBRARIES LinearMath)
|
62 |
+
list (APPEND BULLET_LIBRARIES Bullet3Common)
|
63 |
+
@@ -497,16 +504,18 @@ list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
|
64 |
+
list (APPEND BULLET_LIBRARIES BulletCollision)
|
65 |
+
list (APPEND BULLET_LIBRARIES BulletDynamics)
|
66 |
+
list (APPEND BULLET_LIBRARIES BulletSoftBody)
|
67 |
+
-set (BULLET_USE_FILE ${BULLET_CONFIG_CMAKE_PATH}/UseBullet.cmake)
|
68 |
+
-configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
|
69 |
+
- ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
70 |
+
- @ONLY ESCAPE_QUOTES
|
71 |
+
- )
|
72 |
+
+configure_package_config_file(
|
73 |
+
+ ${CMAKE_CURRENT_SOURCE_DIR}/BulletConfig.cmake.in
|
74 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
75 |
+
+ PATH_VARS INCLUDE_INSTALL_DIR LIB_DESTINATION CMAKE_INSTALL_PREFIX BULLET_CONFIG_CMAKE_PATH
|
76 |
+
+ INSTALL_DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
|
77 |
+
+)
|
78 |
+
OPTION(INSTALL_CMAKE_FILES "Install generated CMake files" ON)
|
79 |
+
|
80 |
+
IF (INSTALL_CMAKE_FILES)
|
81 |
+
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/UseBullet.cmake
|
82 |
+
${CMAKE_CURRENT_BINARY_DIR}/BulletConfig.cmake
|
83 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/BulletConfigVersion.cmake
|
84 |
+
DESTINATION ${BULLET_CONFIG_CMAKE_PATH}
|
85 |
+
)
|
86 |
+
ENDIF (INSTALL_CMAKE_FILES)
|
87 |
+
diff --git a/Extras/BulletRobotics/CMakeLists.txt b/Extras/BulletRobotics/CMakeLists.txt
|
88 |
+
index d2ab423..dabb504 100644
|
89 |
+
--- a/Extras/BulletRobotics/CMakeLists.txt
|
90 |
+
+++ b/Extras/BulletRobotics/CMakeLists.txt
|
91 |
+
@@ -282,7 +282,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION})
|
92 |
+
SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
|
93 |
+
|
94 |
+
IF (BUILD_SHARED_LIBS)
|
95 |
+
- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
96 |
+
+ TARGET_LINK_LIBRARIES(BulletRobotics PUBLIC BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
97 |
+
ENDIF (BUILD_SHARED_LIBS)
|
98 |
+
|
99 |
+
|
100 |
+
diff --git a/Extras/BulletRoboticsGUI/CMakeLists.txt b/Extras/BulletRoboticsGUI/CMakeLists.txt
|
101 |
+
index 57ab97f..27b9992 100644
|
102 |
+
--- a/Extras/BulletRoboticsGUI/CMakeLists.txt
|
103 |
+
+++ b/Extras/BulletRoboticsGUI/CMakeLists.txt
|
104 |
+
@@ -166,7 +166,7 @@ SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES VERSION ${BULLET_VERSION})
|
105 |
+
SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES SOVERSION ${BULLET_VERSION})
|
106 |
+
|
107 |
+
IF (BUILD_SHARED_LIBS)
|
108 |
+
- TARGET_LINK_LIBRARIES(BulletRoboticsGUI BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
109 |
+
+ TARGET_LINK_LIBRARIES(BulletRoboticsGUI PUBLIC BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
|
110 |
+
ENDIF (BUILD_SHARED_LIBS)
|
111 |
+
|
112 |
+
|
113 |
+
diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt
|
114 |
+
index 132a336..62babb0 100644
|
115 |
+
--- a/Extras/ConvexDecomposition/CMakeLists.txt
|
116 |
+
+++ b/Extras/ConvexDecomposition/CMakeLists.txt
|
117 |
+
@@ -39,7 +39,7 @@ SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION})
|
118 |
+
SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION})
|
119 |
+
|
120 |
+
IF (BUILD_SHARED_LIBS)
|
121 |
+
- TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath)
|
122 |
+
+ TARGET_LINK_LIBRARIES(ConvexDecomposition PUBLIC BulletCollision LinearMath)
|
123 |
+
ENDIF (BUILD_SHARED_LIBS)
|
124 |
+
|
125 |
+
IF (INSTALL_EXTRA_LIBS)
|
126 |
+
diff --git a/Extras/InverseDynamics/CMakeLists.txt b/Extras/InverseDynamics/CMakeLists.txt
|
127 |
+
index 22e953a..59b733d 100644
|
128 |
+
--- a/Extras/InverseDynamics/CMakeLists.txt
|
129 |
+
+++ b/Extras/InverseDynamics/CMakeLists.txt
|
130 |
+
@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER
|
131 |
+
SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION})
|
132 |
+
|
133 |
+
IF (BUILD_SHARED_LIBS)
|
134 |
+
- TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
|
135 |
+
+ TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils PUBLIC BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath)
|
136 |
+
ENDIF (BUILD_SHARED_LIBS)
|
137 |
+
|
138 |
+
IF (INSTALL_EXTRA_LIBS)
|
139 |
+
diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
|
140 |
+
index 9b5dce7..2f30385 100644
|
141 |
+
--- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt
|
142 |
+
+++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt
|
143 |
+
@@ -21,7 +21,7 @@ btBulletFile.h
|
144 |
+
ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS})
|
145 |
+
|
146 |
+
IF (BUILD_SHARED_LIBS)
|
147 |
+
- TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath)
|
148 |
+
+ TARGET_LINK_LIBRARIES(BulletFileLoader PUBLIC LinearMath)
|
149 |
+
ENDIF (BUILD_SHARED_LIBS)
|
150 |
+
|
151 |
+
SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION})
|
152 |
+
diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
|
153 |
+
index b56b39a..1684651 100644
|
154 |
+
--- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
|
155 |
+
+++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
|
156 |
+
@@ -16,7 +16,7 @@ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION})
|
157 |
+
SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
|
158 |
+
|
159 |
+
IF (BUILD_SHARED_LIBS)
|
160 |
+
- TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
161 |
+
+ TARGET_LINK_LIBRARIES(BulletWorldImporter PUBLIC BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
162 |
+
ENDIF (BUILD_SHARED_LIBS)
|
163 |
+
|
164 |
+
IF (INSTALL_EXTRA_LIBS)
|
165 |
+
diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
166 |
+
index 9fd125e..889c30e 100644
|
167 |
+
--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
168 |
+
+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
|
169 |
+
@@ -18,7 +18,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO
|
170 |
+
SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION})
|
171 |
+
|
172 |
+
IF (BUILD_SHARED_LIBS)
|
173 |
+
- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
174 |
+
+ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter PUBLIC BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath)
|
175 |
+
ENDIF (BUILD_SHARED_LIBS)
|
176 |
+
|
177 |
+
IF (INSTALL_EXTRA_LIBS)
|
178 |
+
diff --git a/src/Bullet3Collision/CMakeLists.txt b/src/Bullet3Collision/CMakeLists.txt
|
179 |
+
index 130095c..661a461 100644
|
180 |
+
--- a/src/Bullet3Collision/CMakeLists.txt
|
181 |
+
+++ b/src/Bullet3Collision/CMakeLists.txt
|
182 |
+
@@ -69,9 +69,10 @@ IF (INSTALL_LIBS)
|
183 |
+
#FILES_MATCHING requires CMake 2.6
|
184 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
185 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
186 |
+
- INSTALL(TARGETS Bullet3Collision DESTINATION .)
|
187 |
+
+ INSTALL(TARGETS Bullet3Collision EXPORT Bullet3CollisionTargets DESTINATION .)
|
188 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
189 |
+
INSTALL(TARGETS Bullet3Collision
|
190 |
+
+ EXPORT Bullet3CollisionTargets
|
191 |
+
RUNTIME DESTINATION bin
|
192 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
193 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
194 |
+
@@ -89,5 +90,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
195 |
+
#SET_PROPERTY(SOURCE ${Bullet3CollisionBroadPhase_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadPhaseCollision)
|
196 |
+
|
197 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
198 |
+
+ INSTALL(EXPORT Bullet3CollisionTargets
|
199 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
200 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
201 |
+
ENDIF (INSTALL_LIBS)
|
202 |
+
diff --git a/src/Bullet3Common/CMakeLists.txt b/src/Bullet3Common/CMakeLists.txt
|
203 |
+
index e899e67..e990b16 100644
|
204 |
+
--- a/src/Bullet3Common/CMakeLists.txt
|
205 |
+
+++ b/src/Bullet3Common/CMakeLists.txt
|
206 |
+
@@ -37,15 +37,17 @@ SET(Bullet3Common_HDRS
|
207 |
+
ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS})
|
208 |
+
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION})
|
209 |
+
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION})
|
210 |
+
+TARGET_INCLUDE_DIRECTORIES(Bullet3Common INTERFACE $<INSTALL_INTERFACE:include/bullet>)
|
211 |
+
|
212 |
+
IF (INSTALL_LIBS)
|
213 |
+
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
214 |
+
#FILES_MATCHING requires CMake 2.6
|
215 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
216 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
217 |
+
- INSTALL(TARGETS Bullet3Common DESTINATION .)
|
218 |
+
+ INSTALL(TARGETS Bullet3Common EXPORT Bullet3CommonTargets DESTINATION .)
|
219 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
220 |
+
INSTALL(TARGETS Bullet3Common
|
221 |
+
+ EXPORT Bullet3CommonTargets
|
222 |
+
RUNTIME DESTINATION bin
|
223 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
224 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
225 |
+
@@ -59,5 +61,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
226 |
+
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES FRAMEWORK true)
|
227 |
+
SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES PUBLIC_HEADER "${Bullet3Common_HDRS}")
|
228 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
229 |
+
+ INSTALL(EXPORT Bullet3CommonTargets
|
230 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
231 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
232 |
+
ENDIF (INSTALL_LIBS)
|
233 |
+
diff --git a/src/Bullet3Dynamics/CMakeLists.txt b/src/Bullet3Dynamics/CMakeLists.txt
|
234 |
+
index 94c120d..e83503a 100644
|
235 |
+
--- a/src/Bullet3Dynamics/CMakeLists.txt
|
236 |
+
+++ b/src/Bullet3Dynamics/CMakeLists.txt
|
237 |
+
@@ -41,9 +41,10 @@ IF (INSTALL_LIBS)
|
238 |
+
#FILES_MATCHING requires CMake 2.6
|
239 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
240 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
241 |
+
- INSTALL(TARGETS Bullet3Dynamics DESTINATION .)
|
242 |
+
+ INSTALL(TARGETS Bullet3Dynamics EXPORT Bullet3DynamicsTargets DESTINATION .)
|
243 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
244 |
+
INSTALL(TARGETS Bullet3Dynamics
|
245 |
+
+ EXPORT Bullet3DynamicsTargets
|
246 |
+
RUNTIME DESTINATION bin
|
247 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
248 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
249 |
+
@@ -57,5 +58,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
250 |
+
SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES FRAMEWORK true)
|
251 |
+
SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES PUBLIC_HEADER "${Bullet3Dynamics_HDRS}")
|
252 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
253 |
+
+ INSTALL(EXPORT Bullet3DynamicsTargets
|
254 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
255 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
256 |
+
ENDIF (INSTALL_LIBS)
|
257 |
+
diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt
|
258 |
+
index 8206872..e605d79 100644
|
259 |
+
--- a/src/Bullet3Geometry/CMakeLists.txt
|
260 |
+
+++ b/src/Bullet3Geometry/CMakeLists.txt
|
261 |
+
@@ -27,9 +27,12 @@ IF (INSTALL_LIBS)
|
262 |
+
#FILES_MATCHING requires CMake 2.6
|
263 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
264 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
265 |
+
- INSTALL(TARGETS Bullet3Geometry DESTINATION .)
|
266 |
+
+ INSTALL(TARGETS Bullet3Geometry
|
267 |
+
+ EXPORT Bullet3GeometryTargets
|
268 |
+
+ DESTINATION .)
|
269 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
270 |
+
INSTALL(TARGETS Bullet3Geometry
|
271 |
+
+ EXPORT Bullet3GeometryTargets
|
272 |
+
RUNTIME DESTINATION bin
|
273 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
274 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
275 |
+
@@ -43,5 +46,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
276 |
+
SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES FRAMEWORK true)
|
277 |
+
SET_TARGET_PROPERTIES(Bullet3Geometry PROPERTIES PUBLIC_HEADER "${Bullet3Geometry_HDRS}")
|
278 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
279 |
+
+
|
280 |
+
+ INSTALL(EXPORT Bullet3GeometryTargets
|
281 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
282 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
283 |
+
ENDIF (INSTALL_LIBS)
|
284 |
+
diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt
|
285 |
+
index 1da58d4..c1b21df 100644
|
286 |
+
--- a/src/Bullet3OpenCL/CMakeLists.txt
|
287 |
+
+++ b/src/Bullet3OpenCL/CMakeLists.txt
|
288 |
+
@@ -44,7 +44,7 @@ ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_H
|
289 |
+
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION})
|
290 |
+
SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION})
|
291 |
+
IF (BUILD_SHARED_LIBS)
|
292 |
+
- TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS})
|
293 |
+
+ TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew PUBLIC LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS})
|
294 |
+
ENDIF (BUILD_SHARED_LIBS)
|
295 |
+
|
296 |
+
|
297 |
+
@@ -53,9 +53,13 @@ IF (INSTALL_LIBS)
|
298 |
+
#INSTALL of other files requires CMake 2.6
|
299 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
300 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
301 |
+
- INSTALL(TARGETS Bullet3OpenCL_clew DESTINATION .)
|
302 |
+
+ INSTALL(TARGETS BulletDynamics
|
303 |
+
+ EXPORT Bullet3OpenCLTargets
|
304 |
+
+ DESTINATION .)
|
305 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
306 |
+
- INSTALL(TARGETS Bullet3OpenCL_clew RUNTIME DESTINATION bin
|
307 |
+
+ INSTALL(TARGETS Bullet3OpenCL_clew
|
308 |
+
+ EXPORT Bullet3OpenCLTargets
|
309 |
+
+ RUNTIME DESTINATION bin
|
310 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
311 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
312 |
+
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
313 |
+
@@ -73,5 +77,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" E
|
314 |
+
SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
|
315 |
+
|
316 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
317 |
+
+
|
318 |
+
+ INSTALL(EXPORT Bullet3OpenCLTargets
|
319 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
320 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
321 |
+
ENDIF (INSTALL_LIBS)
|
322 |
+
diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
|
323 |
+
index 1255766..67112b4 100644
|
324 |
+
--- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
|
325 |
+
+++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt
|
326 |
+
@@ -35,9 +35,12 @@ IF (INSTALL_LIBS)
|
327 |
+
#FILES_MATCHING requires CMake 2.6
|
328 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
329 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
330 |
+
- INSTALL(TARGETS Bullet2FileLoader DESTINATION .)
|
331 |
+
+ INSTALL(TARGETS Bullet2FileLoader
|
332 |
+
+ EXPORT Bullet2FileLoaderTargets
|
333 |
+
+ DESTINATION .)
|
334 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
335 |
+
INSTALL(TARGETS Bullet2FileLoader
|
336 |
+
+ EXPORT Bullet2FileLoaderTargets
|
337 |
+
RUNTIME DESTINATION bin
|
338 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
339 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
340 |
+
@@ -51,5 +54,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
341 |
+
SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES FRAMEWORK true)
|
342 |
+
SET_TARGET_PROPERTIES(Bullet2FileLoader PROPERTIES PUBLIC_HEADER "${Bullet2FileLoader_HDRS}")
|
343 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
344 |
+
+
|
345 |
+
+ INSTALL(EXPORT Bullet2FileLoaderTargets
|
346 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
347 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
348 |
+
ENDIF (INSTALL_LIBS)
|
349 |
+
diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt
|
350 |
+
index f5d7255..d857637 100644
|
351 |
+
--- a/src/BulletCollision/CMakeLists.txt
|
352 |
+
+++ b/src/BulletCollision/CMakeLists.txt
|
353 |
+
@@ -257,7 +257,7 @@ ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS})
|
354 |
+
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION})
|
355 |
+
SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION})
|
356 |
+
IF (BUILD_SHARED_LIBS)
|
357 |
+
- TARGET_LINK_LIBRARIES(BulletCollision LinearMath)
|
358 |
+
+ TARGET_LINK_LIBRARIES(BulletCollision PUBLIC LinearMath)
|
359 |
+
ENDIF (BUILD_SHARED_LIBS)
|
360 |
+
|
361 |
+
|
362 |
+
@@ -266,9 +266,13 @@ IF (INSTALL_LIBS)
|
363 |
+
#INSTALL of other files requires CMake 2.6
|
364 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
365 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
366 |
+
- INSTALL(TARGETS BulletCollision DESTINATION .)
|
367 |
+
+ INSTALL(TARGETS BulletCollision
|
368 |
+
+ EXPORT BulletCollisionTargets
|
369 |
+
+ DESTINATION .)
|
370 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
371 |
+
- INSTALL(TARGETS BulletCollision RUNTIME DESTINATION bin
|
372 |
+
+ INSTALL(TARGETS BulletCollision
|
373 |
+
+ EXPORT BulletCollisionTargets
|
374 |
+
+ RUNTIME DESTINATION bin
|
375 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
376 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
377 |
+
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
378 |
+
@@ -290,5 +294,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
|
379 |
+
SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
|
380 |
+
|
381 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
382 |
+
+
|
383 |
+
+ INSTALL(EXPORT BulletCollisionTargets
|
384 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
385 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
386 |
+
ENDIF (INSTALL_LIBS)
|
387 |
+
diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
|
388 |
+
index 3332440..d1a1147 100644
|
389 |
+
--- a/src/BulletDynamics/CMakeLists.txt
|
390 |
+
+++ b/src/BulletDynamics/CMakeLists.txt
|
391 |
+
@@ -140,16 +140,21 @@ ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS})
|
392 |
+
SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION})
|
393 |
+
SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
|
394 |
+
IF (BUILD_SHARED_LIBS)
|
395 |
+
- TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath)
|
396 |
+
+ TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC BulletCollision)
|
397 |
+
ENDIF (BUILD_SHARED_LIBS)
|
398 |
+
+TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC LinearMath)
|
399 |
+
|
400 |
+
IF (INSTALL_LIBS)
|
401 |
+
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
402 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
403 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
404 |
+
- INSTALL(TARGETS BulletDynamics DESTINATION .)
|
405 |
+
+ INSTALL(TARGETS BulletDynamics
|
406 |
+
+ EXPORT BulletDynamicsTargets
|
407 |
+
+ DESTINATION .)
|
408 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
409 |
+
- INSTALL(TARGETS BulletDynamics RUNTIME DESTINATION bin
|
410 |
+
+ INSTALL(TARGETS BulletDynamics
|
411 |
+
+ EXPORT BulletDynamicsTargets
|
412 |
+
+ RUNTIME DESTINATION bin
|
413 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
414 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
415 |
+
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
416 |
+
@@ -171,5 +176,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics)
|
417 |
+
SET_PROPERTY(SOURCE ${Featherstone_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Featherstone)
|
418 |
+
SET_PROPERTY(SOURCE ${MLCPSolvers_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MLCPSolvers)
|
419 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
420 |
+
+
|
421 |
+
+ INSTALL(EXPORT BulletDynamicsTargets
|
422 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
423 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
424 |
+
ENDIF (INSTALL_LIBS)
|
425 |
+
diff --git a/src/BulletInverseDynamics/CMakeLists.txt b/src/BulletInverseDynamics/CMakeLists.txt
|
426 |
+
index 3331c27..d4fad26 100644
|
427 |
+
--- a/src/BulletInverseDynamics/CMakeLists.txt
|
428 |
+
+++ b/src/BulletInverseDynamics/CMakeLists.txt
|
429 |
+
@@ -33,7 +33,7 @@ ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseD
|
430 |
+
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION})
|
431 |
+
SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION})
|
432 |
+
IF (BUILD_SHARED_LIBS)
|
433 |
+
- TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath)
|
434 |
+
+ TARGET_LINK_LIBRARIES(BulletInverseDynamics PUBLIC Bullet3Common LinearMath)
|
435 |
+
ENDIF (BUILD_SHARED_LIBS)
|
436 |
+
|
437 |
+
|
438 |
+
@@ -42,9 +42,13 @@ IF (INSTALL_LIBS)
|
439 |
+
#INSTALL of other files requires CMake 2.6
|
440 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
441 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
442 |
+
- INSTALL(TARGETS BulletInverseDynamics DESTINATION .)
|
443 |
+
+ INSTALL(TARGETS BulletInverseDynamics
|
444 |
+
+ EXPORT BulletInverseDynamicsTargets
|
445 |
+
+ DESTINATION .)
|
446 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
447 |
+
- INSTALL(TARGETS BulletInverseDynamics RUNTIME DESTINATION bin
|
448 |
+
+ INSTALL(TARGETS BulletInverseDynamics
|
449 |
+
+ EXPORT BulletInverseDynamicsTargets
|
450 |
+
+ RUNTIME DESTINATION bin
|
451 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
452 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
453 |
+
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
454 |
+
@@ -62,5 +66,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletInverseDynamics)
|
455 |
+
SET_PROPERTY(SOURCE ${BulletInverseDynamicsDetails_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/details)
|
456 |
+
|
457 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
458 |
+
+
|
459 |
+
+ INSTALL(EXPORT BulletInverseDynamicsTargets
|
460 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
461 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
462 |
+
ENDIF (INSTALL_LIBS)
|
463 |
+
diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt
|
464 |
+
index 9452768..5068a30 100644
|
465 |
+
--- a/src/BulletSoftBody/CMakeLists.txt
|
466 |
+
+++ b/src/BulletSoftBody/CMakeLists.txt
|
467 |
+
@@ -78,9 +78,13 @@ IF (INSTALL_LIBS)
|
468 |
+
IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
469 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
470 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
471 |
+
- INSTALL(TARGETS BulletSoftBody DESTINATION .)
|
472 |
+
+ INSTALL(TARGETS BulletSoftBody
|
473 |
+
+ EXPORT BulletSoftBodyTargets
|
474 |
+
+ DESTINATION .)
|
475 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
476 |
+
- INSTALL(TARGETS BulletSoftBody RUNTIME DESTINATION bin
|
477 |
+
+ INSTALL(TARGETS BulletSoftBody
|
478 |
+
+ EXPORT BulletSoftBodyTargets
|
479 |
+
+ RUNTIME DESTINATION bin
|
480 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
481 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
482 |
+
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
483 |
+
@@ -93,5 +97,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
484 |
+
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true)
|
485 |
+
SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}")
|
486 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
487 |
+
+
|
488 |
+
+ INSTALL(EXPORT BulletSoftBodyTargets
|
489 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
490 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
491 |
+
ENDIF (INSTALL_LIBS)
|
492 |
+
diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt
|
493 |
+
index a0532c7..ecf06b3 100644
|
494 |
+
--- a/src/LinearMath/CMakeLists.txt
|
495 |
+
+++ b/src/LinearMath/CMakeLists.txt
|
496 |
+
@@ -63,9 +63,10 @@ IF (INSTALL_LIBS)
|
497 |
+
#FILES_MATCHING requires CMake 2.6
|
498 |
+
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
499 |
+
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
500 |
+
- INSTALL(TARGETS LinearMath DESTINATION .)
|
501 |
+
+ INSTALL(TARGETS LinearMath EXPORT LinearMathTargets DESTINATION .)
|
502 |
+
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
503 |
+
INSTALL(TARGETS LinearMath
|
504 |
+
+ EXPORT LinearMathTargets
|
505 |
+
RUNTIME DESTINATION bin
|
506 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
507 |
+
ARCHIVE DESTINATION lib${LIB_SUFFIX})
|
508 |
+
@@ -79,5 +80,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN
|
509 |
+
SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true)
|
510 |
+
SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}")
|
511 |
+
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
512 |
+
+ INSTALL(EXPORT LinearMathTargets
|
513 |
+
+ DESTINATION ${BULLET_CONFIG_CMAKE_PATH})
|
514 |
+
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
515 |
+
ENDIF (INSTALL_LIBS)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/portfile.cmake
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO bulletphysics/bullet3
|
6 |
+
REF 3.22
|
7 |
+
SHA512 edacf643ca9621523812effe69a7499716bc65282c58c1f5b4eb4f17b2b1ab55a4f71b06a73483f57e57a5b032c234d09ba5fab9881321f2cbc3c27b43fdc95d
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
cmake-fix.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
FEATURES
|
15 |
+
multithreading BULLET2_MULTITHREADING
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_configure(
|
19 |
+
SOURCE_PATH ${SOURCE_PATH}
|
20 |
+
OPTIONS
|
21 |
+
-DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
|
22 |
+
-DBUILD_CPU_DEMOS=OFF
|
23 |
+
-DBUILD_BULLET2_DEMOS=OFF
|
24 |
+
-DBUILD_BULLET3=OFF
|
25 |
+
-DBUILD_EXTRAS=OFF
|
26 |
+
-DBUILD_UNIT_TESTS=OFF
|
27 |
+
-DINSTALL_LIBS=ON
|
28 |
+
${FEATURE_OPTIONS}
|
29 |
+
)
|
30 |
+
|
31 |
+
vcpkg_cmake_install()
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
|
34 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME bullet CONFIG_PATH share/bullet)
|
35 |
+
|
36 |
+
vcpkg_fixup_pkgconfig()
|
37 |
+
|
38 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
39 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
40 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details")
|
41 |
+
|
42 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package bullet3 provides CMake targets:
|
2 |
+
|
3 |
+
find_package(Bullet CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE LinearMath Bullet3Common BulletDynamics BulletSoftBody)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bullet3/vcpkg.json
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "bullet3",
|
3 |
+
"version": "3.22",
|
4 |
+
"description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
|
5 |
+
"homepage": "https://github.com/bulletphysics/bullet3",
|
6 |
+
"license": "Zlib",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
],
|
17 |
+
"features": {
|
18 |
+
"multithreading": {
|
19 |
+
"description": "Multithreading functionality for bullet3"
|
20 |
+
}
|
21 |
+
}
|
22 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/LICENSE
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
Copyright (c) 2014-2018 Jamboree
|
2 |
+
|
3 |
+
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
4 |
+
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/portfile.cmake
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO jamboree/bustache
|
4 |
+
REF abb25ca189425783c6b7ec5c17c5284dccb59faf
|
5 |
+
SHA512 be00451f6a85edccacbdd5d8478d7af4f3162f9a9a31af876004237ca7f303c1262b2ea623e6ec595d73440dc14fcf22d185bc521fd3aca6e28ec43890d611c5
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_configure_cmake(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
PREFER_NINJA
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_install_cmake()
|
15 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH "share/bustache/cmake")
|
16 |
+
|
17 |
+
file(REMOVE_RECURSE
|
18 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
19 |
+
)
|
20 |
+
|
21 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bustache/vcpkg.json
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "bustache",
|
3 |
+
"version-string": "1.1.0",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "C++11 implementation of {{ mustache }}",
|
6 |
+
"homepage": "https://github.com/jamboree/bustache",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-unordered",
|
9 |
+
"boost-utility"
|
10 |
+
]
|
11 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/CMakeLists.txt
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.8.0)
|
2 |
+
project(butteraugli CXX)
|
3 |
+
|
4 |
+
add_compile_options(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
|
5 |
+
if(MSVC)
|
6 |
+
add_compile_options(/W3 /wd4005 /wd4996 /wd4018)
|
7 |
+
else()
|
8 |
+
add_compile_options(-std=c++11)
|
9 |
+
endif()
|
10 |
+
|
11 |
+
find_package(JPEG REQUIRED)
|
12 |
+
find_package(PNG REQUIRED)
|
13 |
+
|
14 |
+
include_directories("." ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
|
15 |
+
|
16 |
+
add_library(butteraugli_lib butteraugli/butteraugli.cc)
|
17 |
+
|
18 |
+
install(
|
19 |
+
TARGETS butteraugli_lib
|
20 |
+
RUNTIME DESTINATION bin
|
21 |
+
LIBRARY DESTINATION lib
|
22 |
+
ARCHIVE DESTINATION lib
|
23 |
+
)
|
24 |
+
|
25 |
+
if(NOT DISABLE_INSTALL_TOOLS)
|
26 |
+
add_executable(butteraugli butteraugli/butteraugli_main.cc)
|
27 |
+
find_library(TURBO turbojpeg)
|
28 |
+
target_link_libraries(butteraugli butteraugli_lib ${JPEG_LIBRARIES} ${TURBO} ${PNG_LIBRARIES})
|
29 |
+
|
30 |
+
install (
|
31 |
+
TARGETS butteraugli
|
32 |
+
RUNTIME DESTINATION tools/butteraugli
|
33 |
+
)
|
34 |
+
endif()
|
35 |
+
|
36 |
+
if(NOT DISABLE_INSTALL_HEADERS)
|
37 |
+
install(FILES butteraugli/butteraugli.h DESTINATION include/butteraugli)
|
38 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/missing_header.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git "a/butteraugli/butteraugli_main.cc" "b/butteraugli/butteraugli_main.cc"
|
2 |
+
index f38af1d..ebf3197 100644
|
3 |
+
--- "a/butteraugli/butteraugli_main.cc"
|
4 |
+
+++ "b/butteraugli/butteraugli_main.cc"
|
5 |
+
@@ -2,6 +2,7 @@
|
6 |
+
#include <cstdint>
|
7 |
+
#include <cstdio>
|
8 |
+
#include <vector>
|
9 |
+
+#include <algorithm>
|
10 |
+
#include "butteraugli/butteraugli.h"
|
11 |
+
|
12 |
+
extern "C" {
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/portfile.cmake
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO google/butteraugli
|
6 |
+
REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511
|
7 |
+
SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
missing_header.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
14 |
+
|
15 |
+
vcpkg_configure_cmake(
|
16 |
+
SOURCE_PATH ${SOURCE_PATH}
|
17 |
+
PREFER_NINJA
|
18 |
+
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
|
19 |
+
)
|
20 |
+
|
21 |
+
vcpkg_install_cmake()
|
22 |
+
vcpkg_copy_pdbs()
|
23 |
+
|
24 |
+
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
25 |
+
|
26 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/butteraugli/vcpkg.json
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "butteraugli",
|
3 |
+
"version-string": "2019-05-08",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "butteraugli estimates the psychovisual difference between two images",
|
6 |
+
"homepage": "https://github.com/google/butteraugli",
|
7 |
+
"dependencies": [
|
8 |
+
"libjpeg-turbo",
|
9 |
+
"libpng"
|
10 |
+
]
|
11 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/byte-lite/portfile.cmake
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO martinmoene/byte-lite
|
4 |
+
REF v0.3.0
|
5 |
+
SHA512 a49c7cf820db2bcf63f231324bca72642161fcaa4ecd9e4b18aa752902f393a3983014feae824fa4f5dea0e7182eadded1a9a83c469fa4039d4d17b3c814b2ef
|
6 |
+
)
|
7 |
+
|
8 |
+
vcpkg_cmake_configure(
|
9 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
10 |
+
OPTIONS
|
11 |
+
-DBYTE_LITE_OPT_BUILD_TESTS=OFF
|
12 |
+
-DBYTE_LITE_OPT_BUILD_EXAMPLES=OFF
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_cmake_install()
|
16 |
+
|
17 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
18 |
+
|
19 |
+
file(REMOVE_RECURSE
|
20 |
+
"${CURRENT_PACKAGES_DIR}/debug"
|
21 |
+
"${CURRENT_PACKAGES_DIR}/lib"
|
22 |
+
)
|
23 |
+
|
24 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/byte-lite/vcpkg.json
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "byte-lite",
|
3 |
+
"version": "0.3.0",
|
4 |
+
"description": "A C++17-like byte type for C++98, C++11 and later in a single-file header-only library",
|
5 |
+
"dependencies": [
|
6 |
+
{
|
7 |
+
"name": "vcpkg-cmake",
|
8 |
+
"host": true
|
9 |
+
},
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake-config",
|
12 |
+
"host": true
|
13 |
+
}
|
14 |
+
]
|
15 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/CMakeLists.txt
ADDED
@@ -0,0 +1,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.0)
|
2 |
+
project(bzip2 C)
|
3 |
+
|
4 |
+
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
5 |
+
add_definitions(-DBZ_DEBUG) # enable extra assertions
|
6 |
+
endif()
|
7 |
+
|
8 |
+
set(BZ2_SOURCES
|
9 |
+
blocksort.c
|
10 |
+
huffman.c
|
11 |
+
crctable.c
|
12 |
+
randtable.c
|
13 |
+
compress.c
|
14 |
+
decompress.c
|
15 |
+
bzlib.c)
|
16 |
+
|
17 |
+
add_library(bz2 ${BZ2_SOURCES})
|
18 |
+
set_target_properties(bz2 PROPERTIES
|
19 |
+
DEBUG_POSTFIX d
|
20 |
+
VERSION 1.0.6
|
21 |
+
SOVERSION 1.0)
|
22 |
+
if(BUILD_SHARED_LIBS)
|
23 |
+
target_compile_definitions(bz2 PRIVATE -DBZ_BUILD_DLL)
|
24 |
+
endif()
|
25 |
+
|
26 |
+
if(MSVC)
|
27 |
+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
28 |
+
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
|
29 |
+
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
|
30 |
+
endif()
|
31 |
+
|
32 |
+
install(TARGETS bz2
|
33 |
+
RUNTIME DESTINATION bin
|
34 |
+
ARCHIVE DESTINATION lib
|
35 |
+
LIBRARY DESTINATION lib)
|
36 |
+
|
37 |
+
if(NOT BZIP2_SKIP_TOOLS)
|
38 |
+
add_executable(bzip2 bzip2.c ${BZ2_SOURCES})
|
39 |
+
add_executable(bzip2recover bzip2recover.c ${BZ2_SOURCES})
|
40 |
+
install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2)
|
41 |
+
endif()
|
42 |
+
|
43 |
+
if(NOT BZIP2_SKIP_HEADERS)
|
44 |
+
install(FILES bzlib.h DESTINATION include)
|
45 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/bzip2.pc.in
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
prefix=@BZIP2_PREFIX@
|
2 |
+
exec_prefix=${prefix}
|
3 |
+
libdir=${prefix}/lib
|
4 |
+
includedir=${prefix}/include
|
5 |
+
|
6 |
+
Name: bzip2
|
7 |
+
Description: bzip2
|
8 |
+
Version: 1.0.6
|
9 |
+
Requires:
|
10 |
+
Libs: -L${libdir} -l@bzname@
|
11 |
+
Cflags: -I${includedir}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/fix-import-export-macros.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/bzlib.h b/bzlib.h
|
2 |
+
index 8277123..84fbd0a 100644
|
3 |
+
--- a/bzlib.h
|
4 |
+
+++ b/bzlib.h
|
5 |
+
@@ -65,29 +65,23 @@ typedef
|
6 |
+
}
|
7 |
+
bz_stream;
|
8 |
+
|
9 |
+
-
|
10 |
+
-#ifndef BZ_IMPORT
|
11 |
+
-#define BZ_EXPORT
|
12 |
+
-#endif
|
13 |
+
-
|
14 |
+
#ifndef BZ_NO_STDIO
|
15 |
+
/* Need a definitition for FILE */
|
16 |
+
#include <stdio.h>
|
17 |
+
#endif
|
18 |
+
|
19 |
+
#ifdef _WIN32
|
20 |
+
-# include <windows.h>
|
21 |
+
# ifdef small
|
22 |
+
/* windows.h define small to char */
|
23 |
+
# undef small
|
24 |
+
# endif
|
25 |
+
-# ifdef BZ_EXPORT
|
26 |
+
-# define BZ_API(func) WINAPI func
|
27 |
+
-# define BZ_EXTERN extern
|
28 |
+
+# define BZ_API(func) func
|
29 |
+
+# if defined(BZ_BUILD_DLL)
|
30 |
+
+# define BZ_EXTERN __declspec(dllexport)
|
31 |
+
+# elif defined(BZ_IMPORT)
|
32 |
+
+# define BZ_EXTERN __declspec(dllimport)
|
33 |
+
# else
|
34 |
+
- /* import windows dll dynamically */
|
35 |
+
-# define BZ_API(func) (WINAPI * func)
|
36 |
+
-# define BZ_EXTERN
|
37 |
+
+# define BZ_EXTERN
|
38 |
+
# endif
|
39 |
+
#else
|
40 |
+
# define BZ_API(func) func
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/portfile.cmake
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(BZIP2_VERSION 1.0.8)
|
2 |
+
vcpkg_download_distfile(ARCHIVE
|
3 |
+
URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz"
|
4 |
+
FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
|
5 |
+
SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
|
6 |
+
)
|
7 |
+
|
8 |
+
vcpkg_extract_source_archive_ex(
|
9 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
10 |
+
ARCHIVE ${ARCHIVE}
|
11 |
+
PATCHES fix-import-export-macros.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
15 |
+
|
16 |
+
vcpkg_configure_cmake(
|
17 |
+
SOURCE_PATH ${SOURCE_PATH}
|
18 |
+
PREFER_NINJA
|
19 |
+
OPTIONS_DEBUG
|
20 |
+
-DBZIP2_SKIP_HEADERS=ON
|
21 |
+
-DBZIP2_SKIP_TOOLS=ON
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_install_cmake()
|
25 |
+
vcpkg_copy_pdbs()
|
26 |
+
|
27 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H)
|
28 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
29 |
+
string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")
|
30 |
+
else()
|
31 |
+
string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")
|
32 |
+
endif()
|
33 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}")
|
34 |
+
|
35 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
36 |
+
set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
|
37 |
+
set(bzname bz2)
|
38 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
|
39 |
+
endif()
|
40 |
+
|
41 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
42 |
+
set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
|
43 |
+
set(bzname bz2d)
|
44 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
|
45 |
+
endif()
|
46 |
+
|
47 |
+
vcpkg_fixup_pkgconfig()
|
48 |
+
|
49 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
50 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package bzip2 is compatible with built-in CMake targets:
|
2 |
+
|
3 |
+
find_package(BZip2 REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE BZip2::BZip2)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/bzip2/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "bzip2",
|
3 |
+
"version-semver": "1.0.8",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
|
6 |
+
"homepage": "https://sourceware.org/bzip2/",
|
7 |
+
"documentation": "https://sourceware.org/bzip2/docs.html"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/avoid-docs.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 194485a..e903e50 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include)
|
6 |
+
ADD_SUBDIRECTORY (src)
|
7 |
+
|
8 |
+
# Docs
|
9 |
+
-ADD_SUBDIRECTORY (docs)
|
10 |
+
+#ADD_SUBDIRECTORY (docs)
|
11 |
+
|
12 |
+
# Tests
|
13 |
+
IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/portfile.cmake
ADDED
@@ -0,0 +1,44 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO c-ares/c-ares
|
4 |
+
REF cares-1_18_1
|
5 |
+
SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e
|
6 |
+
HEAD_REF main
|
7 |
+
PATCHES
|
8 |
+
avoid-docs.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
12 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
|
13 |
+
|
14 |
+
vcpkg_cmake_configure(
|
15 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
16 |
+
OPTIONS
|
17 |
+
-DCARES_STATIC=${BUILD_STATIC}
|
18 |
+
-DCARES_SHARED=${BUILD_SHARED}
|
19 |
+
-DCARES_BUILD_TOOLS=OFF
|
20 |
+
-DCARES_BUILD_TESTS=OFF
|
21 |
+
-DCARES_BUILD_CONTAINER_TESTS=OFF
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_cmake_install()
|
25 |
+
|
26 |
+
vcpkg_copy_pdbs()
|
27 |
+
|
28 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares)
|
29 |
+
vcpkg_fixup_pkgconfig()
|
30 |
+
|
31 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
32 |
+
vcpkg_replace_string(
|
33 |
+
"${CURRENT_PACKAGES_DIR}/include/ares.h"
|
34 |
+
"#ifdef CARES_STATICLIB" "#if 1"
|
35 |
+
)
|
36 |
+
endif()
|
37 |
+
|
38 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS)
|
39 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders
|
40 |
+
endif()
|
41 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
42 |
+
|
43 |
+
# Handle copyright
|
44 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-ares/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "c-ares",
|
3 |
+
"version-semver": "1.18.1",
|
4 |
+
"description": "A C library for asynchronous DNS requests",
|
5 |
+
"homepage": "https://github.com/c-ares/c-ares",
|
6 |
+
"license": "MIT",
|
7 |
+
"supports": "!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/c-dbg-macro/portfile.cmake
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# single header file library
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO eerimoq/dbg-macro
|
6 |
+
REF 78b7655bd0cfc2389fe96a3b6584d2930eb7ebd7
|
7 |
+
SHA512 f755c8cf17b422f43f09dcd4f8232b6130a5933d0ce537ce4874ecb886ad2fd5dee26fe12c10cb1554a3720a1263d0ce07252c0893de395b8c9042c9330e60be
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
file(COPY ${SOURCE_PATH}/include/dbg.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
12 |
+
|
13 |
+
# Handle copyright
|
14 |
+
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c-dbg-macro/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "c-dbg-macro",
|
3 |
+
"version-date": "2020-02-29",
|
4 |
+
"description": "A dbg(...) macro for C",
|
5 |
+
"homepage": "https://github.com/eerimoq/dbg-macro"
|
6 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c4core/portfile.cmake
ADDED
@@ -0,0 +1,88 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
# Get c4core src
|
4 |
+
vcpkg_from_github(
|
5 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
6 |
+
REPO biojppm/c4core
|
7 |
+
REF 636f507c33f0c79dce491aec066455ff384d49dc
|
8 |
+
SHA512 3282876be5883b047e8d25ee392f62d2e9ae79af8fdd65c11b1e36d2fdb0648230fe6c7fb57472a4cbced166979351f12494215aa664977a113b74c26bb6f19b
|
9 |
+
HEAD_REF master
|
10 |
+
)
|
11 |
+
|
12 |
+
set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e)
|
13 |
+
|
14 |
+
# Get cmake scripts for c4core
|
15 |
+
vcpkg_download_distfile(CMAKE_ARCHIVE
|
16 |
+
URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"
|
17 |
+
FILENAME "cmake-${CM_COMMIT_HASH}.zip"
|
18 |
+
SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237
|
19 |
+
)
|
20 |
+
|
21 |
+
vcpkg_extract_source_archive_ex(
|
22 |
+
OUT_SOURCE_PATH SOURCE_PATH_CMAKE
|
23 |
+
ARCHIVE ${CMAKE_ARCHIVE}
|
24 |
+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
|
25 |
+
)
|
26 |
+
|
27 |
+
file(REMOVE_RECURSE "${SOURCE_PATH}/cmake")
|
28 |
+
file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/cmake")
|
29 |
+
|
30 |
+
set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f)
|
31 |
+
|
32 |
+
vcpkg_download_distfile(DEBUGBREAK_ARCHIVE
|
33 |
+
URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip"
|
34 |
+
FILENAME "debugbreak-${DB_COMMIT_HASH}.zip"
|
35 |
+
SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64
|
36 |
+
)
|
37 |
+
|
38 |
+
vcpkg_extract_source_archive_ex(
|
39 |
+
OUT_SOURCE_PATH SOURCE_PATH_DEBUGBREAK
|
40 |
+
ARCHIVE ${DEBUGBREAK_ARCHIVE}
|
41 |
+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
|
42 |
+
)
|
43 |
+
|
44 |
+
file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak")
|
45 |
+
file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak")
|
46 |
+
|
47 |
+
set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209)
|
48 |
+
|
49 |
+
vcpkg_download_distfile(FAST_FLOAT_ARCHIVE
|
50 |
+
URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip"
|
51 |
+
FILENAME "fast_float-${FF_COMMIT_HASH}.zip"
|
52 |
+
SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3
|
53 |
+
)
|
54 |
+
|
55 |
+
vcpkg_extract_source_archive_ex(
|
56 |
+
OUT_SOURCE_PATH SOURCE_PATH_FAST_FLOAT
|
57 |
+
ARCHIVE ${FAST_FLOAT_ARCHIVE}
|
58 |
+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"
|
59 |
+
)
|
60 |
+
|
61 |
+
file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float")
|
62 |
+
file(RENAME ${SOURCE_PATH_FAST_FLOAT} "${SOURCE_PATH}/src/c4/ext/fast_float")
|
63 |
+
|
64 |
+
vcpkg_configure_cmake(
|
65 |
+
SOURCE_PATH ${SOURCE_PATH}
|
66 |
+
PREFER_NINJA
|
67 |
+
)
|
68 |
+
|
69 |
+
vcpkg_install_cmake()
|
70 |
+
|
71 |
+
vcpkg_copy_pdbs()
|
72 |
+
|
73 |
+
if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
|
74 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
|
75 |
+
elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/c4core)
|
76 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c4core)
|
77 |
+
endif()
|
78 |
+
|
79 |
+
# Fix paths in config file
|
80 |
+
file(READ "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" _contents)
|
81 |
+
string(REGEX REPLACE [[[ \t\r\n]*"\${PACKAGE_PREFIX_DIR}[\./\\]*"]] [["${PACKAGE_PREFIX_DIR}/../.."]] _contents "${_contents}")
|
82 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" "${_contents}")
|
83 |
+
|
84 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
85 |
+
|
86 |
+
file(INSTALL
|
87 |
+
"${SOURCE_PATH}/LICENSE.txt"
|
88 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c4core/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "c4core",
|
3 |
+
"version-date": "2021-07-18",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Library of low-level C++ utilities",
|
6 |
+
"homepage": "https://github.com/biojppm/c4core"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c89stringutils/portfile.cmake
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO offscale/c89stringutils
|
4 |
+
REF 375c87aaf50a945b17a76727f3314eb217897caf
|
5 |
+
SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
OPTIONS
|
12 |
+
"-DBUILD_TESTS=OFF"
|
13 |
+
)
|
14 |
+
vcpkg_cmake_install()
|
15 |
+
file(INSTALL "${SOURCE_PATH}/cmake/LICENSE.txt"
|
16 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/c89stringutils"
|
17 |
+
RENAME copyright)
|
18 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/c89stringutils/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "c89stringutils",
|
3 |
+
"version": "0.0.1",
|
4 |
+
"description": "string functions from newer standards / common non-standards for C89",
|
5 |
+
"license": "Apache-2.0 OR MIT",
|
6 |
+
"supports": "!uwp",
|
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/caf/fix_dependency.patch
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/CAFConfig.cmake.in b/cmake/CAFConfig.cmake.in
|
2 |
+
index 1a2348c..6c0d0b2 100644
|
3 |
+
--- a/cmake/CAFConfig.cmake.in
|
4 |
+
+++ b/cmake/CAFConfig.cmake.in
|
5 |
+
@@ -5,5 +5,6 @@ include(CMakeFindDependencyMacro)
|
6 |
+
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
|
7 |
+
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
8 |
+
find_dependency(Threads)
|
9 |
+
+find_dependency(OpenSSL REQUIRED)
|
10 |
+
|
11 |
+
include("${CMAKE_CURRENT_LIST_DIR}/CAFTargets.cmake")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caf/portfile.cmake
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO actor-framework/actor-framework
|
4 |
+
REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5
|
5 |
+
SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
fix_dependency.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
OPTIONS
|
14 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
|
15 |
+
-DCAF_ENABLE_CURL_EXAMPLES=OFF
|
16 |
+
-DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF
|
17 |
+
-DCAF_ENABLE_QT6_EXAMPLES=OFF
|
18 |
+
-DCAF_ENABLE_RUNTIME_CHECKS=OFF
|
19 |
+
-DCAF_ENABLE_ACTOR_PROFILER=OFF
|
20 |
+
-DCAF_ENABLE_EXAMPLES=OFF
|
21 |
+
-DCAF_ENABLE_TESTING=OFF
|
22 |
+
-DCAF_ENABLE_TOOLS=OFF
|
23 |
+
-DCAF_ENABLE_IO_MODULE=ON
|
24 |
+
-DCAF_ENABLE_EXCEPTIONS=ON
|
25 |
+
-DCAF_ENABLE_UTILITY_TARGETS=OFF
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_cmake_install()
|
29 |
+
|
30 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF)
|
31 |
+
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
|
34 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
35 |
+
|
36 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caf/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "caf",
|
3 |
+
"version": "0.18.5",
|
4 |
+
"description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
|
5 |
+
"homepage": "https://github.com/actor-framework/actor-framework",
|
6 |
+
"dependencies": [
|
7 |
+
"openssl",
|
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/caffe2/fix-protobuf-deprecated.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/caffe2/utils/proto_utils.cc b/caffe2/utils/proto_utils.cc
|
2 |
+
index ab2d756..2c36ec4 100644
|
3 |
+
--- a/caffe2/utils/proto_utils.cc
|
4 |
+
+++ b/caffe2/utils/proto_utils.cc
|
5 |
+
@@ -102,10 +102,9 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) {
|
6 |
+
::google::protobuf::io::CopyingInputStreamAdaptor stream(
|
7 |
+
new IfstreamInputStream(filename));
|
8 |
+
stream.SetOwnsCopyingStream(true);
|
9 |
+
- // Total bytes hard limit / warning limit are set to 1GB and 512MB
|
10 |
+
- // respectively.
|
11 |
+
+ // Total bytes hard limit is set to 1GB.
|
12 |
+
::google::protobuf::io::CodedInputStream coded_stream(&stream);
|
13 |
+
- coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20);
|
14 |
+
+ coded_stream.SetTotalBytesLimit(1024LL << 20);
|
15 |
+
return proto->ParseFromCodedStream(&coded_stream);
|
16 |
+
}
|
17 |
+
|
18 |
+
@@ -155,7 +154,7 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) {
|
19 |
+
std::unique_ptr<CodedInputStream> coded_input(
|
20 |
+
new CodedInputStream(raw_input.get()));
|
21 |
+
// A hack to manually allow using very large protocol buffers.
|
22 |
+
- coded_input->SetTotalBytesLimit(1073741824, 536870912);
|
23 |
+
+ coded_input->SetTotalBytesLimit(1073741824);
|
24 |
+
bool success = proto->ParseFromCodedStream(coded_input.get());
|
25 |
+
coded_input.reset();
|
26 |
+
raw_input.reset();
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/fix-space.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
|
2 |
+
index e082298..25186e4 100644
|
3 |
+
--- a/cmake/Utils.cmake
|
4 |
+
+++ b/cmake/Utils.cmake
|
5 |
+
@@ -386,7 +386,7 @@ function(caffe_add_whole_archive_flag lib output_var)
|
6 |
+
set(${output_var} -Wl,-force_load,$<TARGET_FILE:${lib}> PARENT_SCOPE)
|
7 |
+
elseif(MSVC)
|
8 |
+
# In MSVC, we will add whole archive in default.
|
9 |
+
- set(${output_var} -WHOLEARCHIVE:$<TARGET_FILE:${lib}> PARENT_SCOPE)
|
10 |
+
+ set(${output_var} -WHOLEARCHIVE:"$<TARGET_FILE:${lib}>" PARENT_SCOPE)
|
11 |
+
else()
|
12 |
+
# Assume everything else is like gcc
|
13 |
+
set(${output_var} -Wl,--whole-archive ${lib} -Wl,--no-whole-archive PARENT_SCOPE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/msvc-fixes.patch
ADDED
@@ -0,0 +1,396 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 8054d98..35934f5 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -56,6 +56,14 @@ option(USE_ROCKSDB "Use RocksDB" ON)
|
6 |
+
option(USE_SNPE "Use Qualcomm's SNPE library" OFF)
|
7 |
+
option(USE_THREADS "Use Threads" ON)
|
8 |
+
option(USE_ZMQ "Use ZMQ" OFF)
|
9 |
+
+if(MSVC)
|
10 |
+
+ if(BUILD_BUILD_SHARED_LIBS)
|
11 |
+
+ set(USE_STATIC_RUNTIME_DEFAULT OFF)
|
12 |
+
+ else()
|
13 |
+
+ set(USE_STATIC_RUNTIME_DEFAULT ON)
|
14 |
+
+ endif()
|
15 |
+
+ option(USE_STATIC_RUNTIME "Link to the static runtime (/MT) instead of dynamic (/MD)" ${USE_STATIC_RUNTIME_DEFAULT})
|
16 |
+
+endif()
|
17 |
+
|
18 |
+
# External projects
|
19 |
+
include(ExternalProject)
|
20 |
+
@@ -99,7 +107,7 @@ else()
|
21 |
+
foreach(flag_var
|
22 |
+
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
|
23 |
+
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
|
24 |
+
- if (NOT ${BUILD_SHARED_LIBS})
|
25 |
+
+ if (USE_STATIC_RUNTIME)
|
26 |
+
if(${flag_var} MATCHES "/MD")
|
27 |
+
string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
28 |
+
endif(${flag_var} MATCHES "/MD")
|
29 |
+
diff --git a/caffe2/core/logging.cc b/caffe2/core/logging.cc
|
30 |
+
index 1b4468e..1379f3a 100644
|
31 |
+
--- a/caffe2/core/logging.cc
|
32 |
+
+++ b/caffe2/core/logging.cc
|
33 |
+
@@ -117,7 +117,7 @@ using fLB::FLAGS_logtostderr;
|
34 |
+
|
35 |
+
#endif // CAFFE2_USE_GFLAGS
|
36 |
+
|
37 |
+
-CAFFE2_DEFINE_int(caffe2_log_level, google::ERROR,
|
38 |
+
+CAFFE2_DEFINE_int(caffe2_log_level, google::GLOG_ERROR,
|
39 |
+
"The minimum log level that caffe2 will output.");
|
40 |
+
|
41 |
+
// Google glog's api does not have an external function that allows one to check
|
42 |
+
@@ -134,15 +134,23 @@ bool IsGoogleLoggingInitialized();
|
43 |
+
namespace caffe2 {
|
44 |
+
bool InitCaffeLogging(int* argc, char** argv) {
|
45 |
+
if (*argc == 0) return true;
|
46 |
+
- if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) {
|
47 |
+
+#if !(defined(_MSC_VER) && defined(GLOG_IS_A_DLL))
|
48 |
+
+ // IsGoogleLoggingInitialized is not exported from the glog DLL
|
49 |
+
+ // so we can't call it. If our program calls InitGoogleLogging twice glog will
|
50 |
+
+ // abort it.
|
51 |
+
+ if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
|
52 |
+
+#endif
|
53 |
+
+ {
|
54 |
+
::google::InitGoogleLogging(argv[0]);
|
55 |
+
+#if !defined(_MSC_VER)
|
56 |
+
::google::InstallFailureSignalHandler();
|
57 |
+
+#endif
|
58 |
+
}
|
59 |
+
// If caffe2_log_level is set and is lower than the min log level by glog,
|
60 |
+
// we will transfer the caffe2_log_level setting to glog to override that.
|
61 |
+
FLAGS_minloglevel = std::min(FLAGS_caffe2_log_level, FLAGS_minloglevel);
|
62 |
+
// If caffe2_log_level is explicitly set, let's also turn on logtostderr.
|
63 |
+
- if (FLAGS_caffe2_log_level < google::ERROR) {
|
64 |
+
+ if (FLAGS_caffe2_log_level < google::GLOG_ERROR) {
|
65 |
+
FLAGS_logtostderr = 1;
|
66 |
+
}
|
67 |
+
// Also, transfer the caffe2_log_level verbose setting to glog.
|
68 |
+
@@ -154,7 +162,7 @@ bool InitCaffeLogging(int* argc, char** argv) {
|
69 |
+
|
70 |
+
void ShowLogInfoToStderr() {
|
71 |
+
FLAGS_logtostderr = 1;
|
72 |
+
- FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::INFO);
|
73 |
+
+ FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO);
|
74 |
+
}
|
75 |
+
} // namespace caffe2
|
76 |
+
|
77 |
+
diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h
|
78 |
+
index 7dd2b4f..2df4435 100644
|
79 |
+
--- a/caffe2/core/logging_is_google_glog.h
|
80 |
+
+++ b/caffe2/core/logging_is_google_glog.h
|
81 |
+
@@ -8,7 +8,7 @@
|
82 |
+
// it. Some mobile platforms do not like stl_logging, so we add an
|
83 |
+
// overload in that case as well.
|
84 |
+
|
85 |
+
-#if !defined(__CUDACC__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
|
86 |
+
+#if !defined(__CUDARCH__) && !defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
|
87 |
+
#include <glog/stl_logging.h>
|
88 |
+
#else // !defined(__CUDACC__) && !!defined(CAFFE2_USE_MINIMAL_GOOGLE_GLOG)
|
89 |
+
|
90 |
+
diff --git a/caffe2/image/image_input_op.h b/caffe2/image/image_input_op.h
|
91 |
+
index 9604e98..7d90014 100644
|
92 |
+
--- a/caffe2/image/image_input_op.h
|
93 |
+
+++ b/caffe2/image/image_input_op.h
|
94 |
+
@@ -214,13 +214,13 @@ ImageInputOp<Context>::ImageInputOp(
|
95 |
+
|
96 |
+
// hard-coded PCA eigenvectors and eigenvalues, based on RBG channel order
|
97 |
+
color_lighting_eigvecs_.push_back(
|
98 |
+
- std::vector<float>{-144.7125, 183.396, 102.2295});
|
99 |
+
+ std::vector<float>{-144.7125f, 183.396f, 102.2295f});
|
100 |
+
color_lighting_eigvecs_.push_back(
|
101 |
+
- std::vector<float>{-148.104, -1.1475, -207.57});
|
102 |
+
+ std::vector<float>{-148.104f, -1.1475f, -207.57f});
|
103 |
+
color_lighting_eigvecs_.push_back(
|
104 |
+
- std::vector<float>{-148.818, -177.174, 107.1765});
|
105 |
+
+ std::vector<float>{-148.818f, -177.174f, 107.1765f});
|
106 |
+
|
107 |
+
- color_lighting_eigvals_ = std::vector<float>{0.2175, 0.0188, 0.0045};
|
108 |
+
+ color_lighting_eigvals_ = std::vector<float>{0.2175f, 0.0188f, 0.0045f};
|
109 |
+
|
110 |
+
CAFFE_ENFORCE_GT(batch_size_, 0, "Batch size should be nonnegative.");
|
111 |
+
if (use_caffe_datum_) {
|
112 |
+
diff --git a/caffe2/operators/batch_matmul_op.cc b/caffe2/operators/batch_matmul_op.cc
|
113 |
+
index c2e578d..28cf030 100644
|
114 |
+
--- a/caffe2/operators/batch_matmul_op.cc
|
115 |
+
+++ b/caffe2/operators/batch_matmul_op.cc
|
116 |
+
@@ -34,7 +34,7 @@ size (C x K x N) where C is the batch size and i ranges from 0 to C-1.
|
117 |
+
b_dim1 = in[1].dims(2);
|
118 |
+
}
|
119 |
+
return vector<TensorShape> {
|
120 |
+
- CreateTensorShape(vector<int> {
|
121 |
+
+ CreateTensorShape(vector<TIndex> {
|
122 |
+
in[0].dims(0), a_dim0, b_dim1},
|
123 |
+
in[0].data_type())
|
124 |
+
};
|
125 |
+
diff --git a/caffe2/operators/layer_norm_op.cu b/caffe2/operators/layer_norm_op.cu
|
126 |
+
index df13fc3..68bbc97 100644
|
127 |
+
--- a/caffe2/operators/layer_norm_op.cu
|
128 |
+
+++ b/caffe2/operators/layer_norm_op.cu
|
129 |
+
@@ -252,8 +252,8 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
|
130 |
+
auto* ginput = Output(0);
|
131 |
+
|
132 |
+
const auto canonical_axis = norm_inputs.canonical_axis_index(axis_);
|
133 |
+
- const int left = norm_inputs.size_to_dim(canonical_axis);
|
134 |
+
- const int right = norm_inputs.size_from_dim(canonical_axis);
|
135 |
+
+ const TIndex left = norm_inputs.size_to_dim(canonical_axis);
|
136 |
+
+ const TIndex right = norm_inputs.size_from_dim(canonical_axis);
|
137 |
+
|
138 |
+
ginput->ResizeLike(norm_inputs);
|
139 |
+
std::vector<TIndex> stats_dims(
|
140 |
+
@@ -261,7 +261,7 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
|
141 |
+
stats_dims.push_back(1);
|
142 |
+
dmean_.Resize(stats_dims);
|
143 |
+
dstdev_.Resize(stats_dims);
|
144 |
+
- gscratch_.Resize(std::vector<size_t>{left, right});
|
145 |
+
+ gscratch_.Resize(std::vector<TIndex>{left, right});
|
146 |
+
|
147 |
+
std::vector<int> segs(left + 1);
|
148 |
+
std::iota(segs.begin(), segs.end(), 0);
|
149 |
+
@@ -291,7 +291,7 @@ bool LayerNormGradientOp<CUDAContext>::DoRunWithType<float>() {
|
150 |
+
dout.data<float>(),
|
151 |
+
gscratch_.mutable_data<float>());
|
152 |
+
|
153 |
+
- dstdev_.Resize(vector<size_t>{left, 1});
|
154 |
+
+ dstdev_.Resize(vector<TIndex>{left, 1});
|
155 |
+
// dstdev = reduce(temp1)
|
156 |
+
allocScratchAndReduce(
|
157 |
+
gscratch_.data<float>(),
|
158 |
+
diff --git a/caffe2/operators/lengths_top_k_op.cc b/caffe2/operators/lengths_top_k_op.cc
|
159 |
+
index c871d53..bad741a 100644
|
160 |
+
--- a/caffe2/operators/lengths_top_k_op.cc
|
161 |
+
+++ b/caffe2/operators/lengths_top_k_op.cc
|
162 |
+
@@ -14,7 +14,7 @@ bool LengthsTopKOp<T, Context>::RunOnDevice() {
|
163 |
+
|
164 |
+
output_topk_values->Resize(N * k_);
|
165 |
+
output_topk_indices->Resize(N * k_);
|
166 |
+
- std::vector<int> output_dims = std::vector<int>({N, k_});
|
167 |
+
+ std::vector<TIndex> output_dims = std::vector<TIndex>({N, k_});
|
168 |
+
output_topk_values->Reshape(output_dims);
|
169 |
+
output_topk_indices->Reshape(output_dims);
|
170 |
+
T* output_topk_values_data = output_topk_values->template mutable_data<T>();
|
171 |
+
diff --git a/caffe2/operators/pool_op_cudnn.cu b/caffe2/operators/pool_op_cudnn.cu
|
172 |
+
index a380d8d..b0cd326 100644
|
173 |
+
--- a/caffe2/operators/pool_op_cudnn.cu
|
174 |
+
+++ b/caffe2/operators/pool_op_cudnn.cu
|
175 |
+
@@ -467,6 +467,15 @@ class CuDNNPoolGradientOp : public ConvPoolOpBase<CUDAContext> {
|
176 |
+
cudnnPoolingDescriptor_t pooling_desc_;
|
177 |
+
cudnnPoolingMode_t mode_;
|
178 |
+
|
179 |
+
+// MSVC defines IN and OUT in minwindef.h
|
180 |
+
+#ifdef IN
|
181 |
+
+#undef IN
|
182 |
+
+#endif
|
183 |
+
+
|
184 |
+
+#ifdef OUT
|
185 |
+
+#undef OUT
|
186 |
+
+#endif
|
187 |
+
+
|
188 |
+
// Input: X, Y, dY
|
189 |
+
// Output: dX
|
190 |
+
INPUT_TAGS(IN, OUT, OUT_GRAD);
|
191 |
+
diff --git a/caffe2/operators/recurrent_op_cudnn.cc b/caffe2/operators/recurrent_op_cudnn.cc
|
192 |
+
index 7777813..58bc8c3 100644
|
193 |
+
--- a/caffe2/operators/recurrent_op_cudnn.cc
|
194 |
+
+++ b/caffe2/operators/recurrent_op_cudnn.cc
|
195 |
+
@@ -115,10 +115,11 @@ void RecurrentBaseOp<T>::initialize(
|
196 |
+
|
197 |
+
// RNN setup
|
198 |
+
{
|
199 |
+
- CUDNN_ENFORCE(cudnnSetRNNDescriptor(
|
200 |
+
+// Do not use #if condition inside CUDNN_ENFORCE
|
201 |
+
+// to avoid macro expansion errors.
|
202 |
+
#if CUDNN_MAJOR >= 7
|
203 |
+
+CUDNN_ENFORCE(cudnnSetRNNDescriptor(
|
204 |
+
cudnn_wrapper_.inline_cudnn_handle(),
|
205 |
+
-#endif
|
206 |
+
rnnDesc_,
|
207 |
+
hiddenSize,
|
208 |
+
numLayers,
|
209 |
+
@@ -126,10 +127,19 @@ void RecurrentBaseOp<T>::initialize(
|
210 |
+
rnnInput,
|
211 |
+
rnnDirection,
|
212 |
+
rnnMode,
|
213 |
+
-#if CUDNN_MAJOR >= 7
|
214 |
+
CUDNN_RNN_ALGO_STANDARD, // TODO: verify correctness / efficiency.
|
215 |
+
-#endif
|
216 |
+
cudnnTypeWrapper<T>::type));
|
217 |
+
+#else
|
218 |
+
+ CUDNN_ENFORCE(cudnnSetRNNDescriptor(
|
219 |
+
+ rnnDesc_,
|
220 |
+
+ hiddenSize,
|
221 |
+
+ numLayers,
|
222 |
+
+ dropoutDesc_,
|
223 |
+
+ rnnInput,
|
224 |
+
+ rnnDirection,
|
225 |
+
+ rnnMode,
|
226 |
+
+ cudnnTypeWrapper<T>::type));
|
227 |
+
+#endif // CUDNN_MAJOR >= 7
|
228 |
+
}
|
229 |
+
// X setup
|
230 |
+
{
|
231 |
+
diff --git a/caffe2/utils/CMakeLists.txt b/caffe2/utils/CMakeLists.txt
|
232 |
+
index f90af5a..919a638 100644
|
233 |
+
--- a/caffe2/utils/CMakeLists.txt
|
234 |
+
+++ b/caffe2/utils/CMakeLists.txt
|
235 |
+
@@ -27,6 +27,10 @@ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${Caffe2_GPU_SRCS})
|
236 |
+
# will directly link nnpack pthreadpool.
|
237 |
+
file(GLOB_RECURSE tmp pthreadpool*)
|
238 |
+
exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp})
|
239 |
+
+if(MSVC)
|
240 |
+
+ file(GLOB_RECURSE tmp *ThreadPool.cc)
|
241 |
+
+ exclude(Caffe2_CPU_SRCS "${Caffe2_CPU_SRCS}" ${tmp})
|
242 |
+
+endif()
|
243 |
+
|
244 |
+
# ---[ GPU test files
|
245 |
+
file(GLOB_RECURSE tmp *_gpu_test.cc)
|
246 |
+
diff --git a/caffe2/utils/GpuBitonicSort.cuh b/caffe2/utils/GpuBitonicSort.cuh
|
247 |
+
index f52bb50..a199bcb 100644
|
248 |
+
--- a/caffe2/utils/GpuBitonicSort.cuh
|
249 |
+
+++ b/caffe2/utils/GpuBitonicSort.cuh
|
250 |
+
@@ -39,9 +39,11 @@ __device__ inline void bitonicSort(K* keys,
|
251 |
+
// Assume the sort is taking place in shared memory
|
252 |
+
// static_assert(Power2SortSize * (sizeof(K) + sizeof(V)) < 32768,
|
253 |
+
// "sort data too large (>32768 bytes)");
|
254 |
+
- static_assert(math::integerIsPowerOf2(Power2SortSize),
|
255 |
+
+ static_assert(math::integerIsPowerOf2(
|
256 |
+
+ std::integral_constant<int, Power2SortSize>::value),
|
257 |
+
"sort size must be power of 2");
|
258 |
+
- static_assert(math::integerIsPowerOf2(ThreadsPerBlock),
|
259 |
+
+ static_assert(math::integerIsPowerOf2(
|
260 |
+
+ std::integral_constant<int, ThreadsPerBlock>::value),
|
261 |
+
"threads in block must be power of 2");
|
262 |
+
|
263 |
+
// If what we are sorting is too small, then not all threads
|
264 |
+
@@ -107,7 +109,8 @@ __device__ inline void warpBitonicSort(K* keys,
|
265 |
+
// Smaller sorts should use a warp shuffle sort
|
266 |
+
static_assert(Power2SortSize > kWarpSize,
|
267 |
+
"sort not large enough");
|
268 |
+
- static_assert(math::integerIsPowerOf2(Power2SortSize),
|
269 |
+
+ static_assert(math::integerIsPowerOf2(
|
270 |
+
+ std::integral_constant<int, Power2SortSize>::value),
|
271 |
+
"sort size must be power of 2");
|
272 |
+
static_assert(Power2SortSize <= kMaxBitonicSortSize,
|
273 |
+
"sort size <= 4096 only supported");
|
274 |
+
diff --git a/caffe2/utils/math.h b/caffe2/utils/math.h
|
275 |
+
index 6c352dc..a1eda9d 100644
|
276 |
+
--- a/caffe2/utils/math.h
|
277 |
+
+++ b/caffe2/utils/math.h
|
278 |
+
@@ -426,18 +426,10 @@ constexpr T roundUp(T a, T b) {
|
279 |
+
return divUp<T>(a, b) * b;
|
280 |
+
}
|
281 |
+
|
282 |
+
-// Returns true if the given integer type is a power-of-2 (positive only)
|
283 |
+
-// Note(jiayq): windows reported an error per
|
284 |
+
-// https://github.com/caffe2/caffe2/issues/997
|
285 |
+
-// and as a result will make it a macro.
|
286 |
+
-#ifdef _MSC_VER
|
287 |
+
-#define integerIsPowerOf2(v) ((v) && !((v) & ((v) - 1)))
|
288 |
+
-#else // _MSC_VER
|
289 |
+
template <typename T>
|
290 |
+
constexpr bool integerIsPowerOf2(T v) {
|
291 |
+
return (v && !(v & (v - 1)));
|
292 |
+
}
|
293 |
+
-#endif // _MSC_VER
|
294 |
+
|
295 |
+
// Returns log2(n) for a positive integer type
|
296 |
+
template <typename T>
|
297 |
+
diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake
|
298 |
+
index df70e2f..ca1b123 100644
|
299 |
+
--- a/cmake/Cuda.cmake
|
300 |
+
+++ b/cmake/Cuda.cmake
|
301 |
+
@@ -37,6 +37,10 @@ function(caffe2_detect_installed_gpus out_variable)
|
302 |
+
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
303 |
+
|
304 |
+
if(__nvcc_res EQUAL 0)
|
305 |
+
+ # nvcc outputs text containing line breaks when building with MSVC.
|
306 |
+
+ # The line below prevents CMake from inserting a variable with line
|
307 |
+
+ # breaks in the cache
|
308 |
+
+ string(REGEX MATCH "([1-9].[0-9])" __nvcc_out "${__nvcc_out}")
|
309 |
+
string(REPLACE "2.1" "2.1(2.0)" __nvcc_out "${__nvcc_out}")
|
310 |
+
set(CUDA_gpu_detect_output ${__nvcc_out} CACHE INTERNAL "Returned GPU architetures from caffe_detect_gpus tool" FORCE)
|
311 |
+
endif()
|
312 |
+
@@ -249,7 +253,7 @@ endif()
|
313 |
+
# Debug and Release symbol support
|
314 |
+
if (MSVC)
|
315 |
+
if (${CMAKE_BUILD_TYPE} MATCHES "Release")
|
316 |
+
- if (${BUILD_SHARED_LIBS})
|
317 |
+
+ if (NOT USE_STATIC_RUNTIME)
|
318 |
+
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MD")
|
319 |
+
else()
|
320 |
+
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MT")
|
321 |
+
@@ -259,7 +263,7 @@ if (MSVC)
|
322 |
+
"Caffe2 currently does not support the combination of MSVC, Cuda "
|
323 |
+
"and Debug mode. Either set USE_CUDA=OFF or set the build type "
|
324 |
+
"to Release")
|
325 |
+
- if (${BUILD_SHARED_LIBS})
|
326 |
+
+ if (NOT USE_STATIC_RUNTIME)
|
327 |
+
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MDd")
|
328 |
+
else()
|
329 |
+
list(APPEND CUDA_NVCC_FLAGS "-Xcompiler -MTd")
|
330 |
+
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
331 |
+
index afb6b68..bdad8b6 100644
|
332 |
+
--- a/cmake/Dependencies.cmake
|
333 |
+
+++ b/cmake/Dependencies.cmake
|
334 |
+
@@ -182,6 +182,15 @@ if(USE_OPENCV)
|
335 |
+
message(WARNING "Not compiling with OpenCV. Suppress this warning with -DUSE_OPENCV=OFF")
|
336 |
+
set(USE_OPENCV OFF)
|
337 |
+
endif()
|
338 |
+
+ if(USE_OPENCV AND VCPKG_TARGET_TRIPLET MATCHES static)
|
339 |
+
+ find_package(LibLZMA QUIET)
|
340 |
+
+ if(LIBLZMA_FOUND)
|
341 |
+
+ list(APPEND Caffe2_DEPENDENCY_LIBS ${LIBLZMA_LIBRARIES})
|
342 |
+
+ else()
|
343 |
+
+ message(WARNING "Not compiling with OpenCV. Could not find liblzma. Suppress this warning with -DUSE_OPENCV=OFF")
|
344 |
+
+ set(USE_OPENCV OFF)
|
345 |
+
+ endif()
|
346 |
+
+ endif()
|
347 |
+
endif()
|
348 |
+
|
349 |
+
# ---[ FFMPEG
|
350 |
+
diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake
|
351 |
+
index 1167532..9780ba5 100644
|
352 |
+
--- a/cmake/Modules/FindGlog.cmake
|
353 |
+
+++ b/cmake/Modules/FindGlog.cmake
|
354 |
+
@@ -27,6 +27,10 @@ if(MSVC)
|
355 |
+
endif()
|
356 |
+
if(TARGET ${GLOG_LIBRARY})
|
357 |
+
get_target_property(GLOG_INCLUDE_DIR ${GLOG_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES)
|
358 |
+
+ get_target_property(GLOG_TYPE ${GLOG_LIBRARY} TYPE)
|
359 |
+
+ if("${GLOG_TYPE}" STREQUAL "SHARED_LIBRARY")
|
360 |
+
+ add_definitions(-DGLOG_IS_A_DLL=1)
|
361 |
+
+ endif()
|
362 |
+
endif()
|
363 |
+
else()
|
364 |
+
find_library(GLOG_LIBRARY glog
|
365 |
+
diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake
|
366 |
+
index 89975c8..e37d6da 100644
|
367 |
+
--- a/cmake/ProtoBuf.cmake
|
368 |
+
+++ b/cmake/ProtoBuf.cmake
|
369 |
+
@@ -13,6 +13,9 @@ function(custom_protobuf_find)
|
370 |
+
# so we turn it off here.
|
371 |
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations" PARENT_SCOPE)
|
372 |
+
endif()
|
373 |
+
+ if(MSVC)
|
374 |
+
+ set(protobuf_MSVC_STATIC_RUNTIME ${USE_STATIC_RUNTIME})
|
375 |
+
+ endif()
|
376 |
+
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake)
|
377 |
+
caffe2_include_directories(${PROJECT_SOURCE_DIR}/third_party/protobuf/src)
|
378 |
+
list(APPEND Caffe2_DEPENDENCY_LIBS libprotobuf)
|
379 |
+
diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
|
380 |
+
index b7423a6..2996484 100644
|
381 |
+
--- a/cmake/Summary.cmake
|
382 |
+
+++ b/cmake/Summary.cmake
|
383 |
+
@@ -19,6 +19,13 @@ function (Caffe2_print_configuration_summary)
|
384 |
+
message(STATUS " System : ${CMAKE_SYSTEM_NAME}")
|
385 |
+
message(STATUS " C++ compiler : ${CMAKE_CXX_COMPILER}")
|
386 |
+
message(STATUS " C++ compiler version : ${CMAKE_CXX_COMPILER_VERSION}")
|
387 |
+
+ if(MSVC)
|
388 |
+
+ if(USE_STATIC_RUNTIME)
|
389 |
+
+ message(STATUS " Runtime : static (/MT)")
|
390 |
+
+ else()
|
391 |
+
+ message(STATUS " Runtime : dynamic (/MD)")
|
392 |
+
+ endif()
|
393 |
+
+ endif()
|
394 |
+
message(STATUS " Protobuf compiler : ${PROTOBUF_PROTOC_EXECUTABLE}")
|
395 |
+
message(STATUS " CXX flags : ${CMAKE_CXX_FLAGS}")
|
396 |
+
message(STATUS " Build type : ${CMAKE_BUILD_TYPE}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/no-inout-macros.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h
|
2 |
+
index 2df4435..408bb4a 100644
|
3 |
+
--- a/caffe2/core/logging_is_google_glog.h
|
4 |
+
+++ b/caffe2/core/logging_is_google_glog.h
|
5 |
+
@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set)
|
6 |
+
|
7 |
+
#include <glog/logging.h>
|
8 |
+
|
9 |
+
+#ifdef IN
|
10 |
+
+#undef IN
|
11 |
+
+#endif
|
12 |
+
+
|
13 |
+
+#ifdef OUT
|
14 |
+
+#undef OUT
|
15 |
+
+#endif
|
16 |
+
+
|
17 |
+
|
18 |
+
#endif // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/portfile.cmake
ADDED
@@ -0,0 +1,101 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO caffe2/caffe2
|
6 |
+
REF eab13a2d5c807bf5d49efd4584787b639a981b79
|
7 |
+
SHA512 505a8540b0c28329c4e2ce443ac8e198c1ee613eb6b932927ee9d04c8afdc95081f3c4581408b7097d567840427b31f6d7626ea80f27e56532f2f2e6acd87023
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
msvc-fixes.patch
|
11 |
+
fix-space.patch
|
12 |
+
fix-protobuf-deprecated.patch
|
13 |
+
no-inout-macros.patch
|
14 |
+
)
|
15 |
+
|
16 |
+
if(VCPKG_CRT_LINKAGE STREQUAL static)
|
17 |
+
set(USE_STATIC_RUNTIME ON)
|
18 |
+
else()
|
19 |
+
set(USE_STATIC_RUNTIME OFF)
|
20 |
+
endif()
|
21 |
+
|
22 |
+
if(CMAKE_HOST_WIN32)
|
23 |
+
set(EXECUTABLE_SUFFIX ".exe")
|
24 |
+
else()
|
25 |
+
set(EXECUTABLE_SUFFIX "")
|
26 |
+
endif()
|
27 |
+
|
28 |
+
vcpkg_cmake_configure(
|
29 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
30 |
+
OPTIONS
|
31 |
+
# Set to ON to use python
|
32 |
+
-DBUILD_PYTHON=OFF
|
33 |
+
-DUSE_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
|
34 |
+
-DUSE_GFLAGS=ON
|
35 |
+
-DUSE_GLOG=ON
|
36 |
+
# Cannot use OpenCV without USE_CUDA=ON right now
|
37 |
+
-DUSE_OPENCV=OFF
|
38 |
+
-DUSE_THREADS=ON
|
39 |
+
# Uncomment to use MKL
|
40 |
+
# -DBLAS=MKL
|
41 |
+
-DUSE_CUDA=OFF
|
42 |
+
-DUSE_FFMPEG=OFF
|
43 |
+
-DUSE_GLOO=OFF
|
44 |
+
-DUSE_LEVELDB=OFF
|
45 |
+
-DUSE_LITE_PROTO=OFF
|
46 |
+
-DUSE_METAL=OFF
|
47 |
+
-DUSE_MOBILE_OPENGL=OFF
|
48 |
+
-DUSE_MPI=OFF
|
49 |
+
-DUSE_NCCL=OFF
|
50 |
+
-DUSE_NERVANA_GPU=OFF
|
51 |
+
-DUSE_NNPACK=OFF
|
52 |
+
-DUSE_OBSERVERS=OFF
|
53 |
+
-DUSE_OPENMP=ON
|
54 |
+
-DUSE_REDIS=OFF
|
55 |
+
-DUSE_ROCKSDB=OFF
|
56 |
+
-DUSE_SNPE=OFF
|
57 |
+
-DUSE_ZMQ=OFF
|
58 |
+
-DBUILD_TEST=OFF
|
59 |
+
-DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX}
|
60 |
+
)
|
61 |
+
|
62 |
+
vcpkg_cmake_install()
|
63 |
+
|
64 |
+
# Remove folders from install
|
65 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe")
|
66 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe2")
|
67 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe")
|
68 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe2")
|
69 |
+
|
70 |
+
# Remove empty directories from include (should probably fix or
|
71 |
+
# patch caffe2 install script)
|
72 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/test")
|
73 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/python")
|
74 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python")
|
75 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl")
|
76 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack")
|
77 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub")
|
78 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04")
|
79 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/binaries")
|
80 |
+
|
81 |
+
# Move bin to tools
|
82 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
|
83 |
+
file(GLOB BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}")
|
84 |
+
foreach(binary IN LISTS BINARIES)
|
85 |
+
get_filename_component(binary_name ${binary} NAME)
|
86 |
+
file(RENAME ${binary} "${CURRENT_PACKAGES_DIR}/tools/${binary_name}")
|
87 |
+
endforeach()
|
88 |
+
|
89 |
+
# Remove bin directory
|
90 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
91 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
92 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
93 |
+
endif()
|
94 |
+
|
95 |
+
# Remove headers and tools from debug build
|
96 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
97 |
+
|
98 |
+
# install license
|
99 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
100 |
+
|
101 |
+
vcpkg_copy_pdbs()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/caffe2/vcpkg.json
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "caffe2",
|
3 |
+
"version": "0.8.1",
|
4 |
+
"port-version": 6,
|
5 |
+
"description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.",
|
6 |
+
"homepage": "https://github.com/caffe2/caffe2",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"supports": "!x86",
|
9 |
+
"dependencies": [
|
10 |
+
"eigen3",
|
11 |
+
"gflags",
|
12 |
+
"glog",
|
13 |
+
"lmdb",
|
14 |
+
"protobuf",
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake",
|
17 |
+
"host": true
|
18 |
+
}
|
19 |
+
]
|
20 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/cairo_static_fix.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900
|
2 |
+
+++ meson.build 2022-03-29 21:32:41.000000000 +0900
|
3 |
+
@@ -100,6 +100,13 @@
|
4 |
+
# Autotools compatibility
|
5 |
+
add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
|
6 |
+
|
7 |
+
+if host_machine.system() == 'windows'
|
8 |
+
+ lib_default = get_option('default_library')
|
9 |
+
+ if lib_default == 'static'
|
10 |
+
+ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c')
|
11 |
+
+ endif
|
12 |
+
+endif
|
13 |
+
+
|
14 |
+
# Make sure source directory hasn't been configured with autotools
|
15 |
+
fs = import('fs')
|
16 |
+
if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h')
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/disable-atomic-ops-check.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/meson.build b/meson.build
|
2 |
+
index e3ec5d9..7b20c0c 100644
|
3 |
+
--- a/meson.build
|
4 |
+
+++ b/meson.build
|
5 |
+
@@ -870,7 +870,7 @@ if cc.links(files('meson-cc-tests/atomic-ops-cxx11.c'), name: 'Atomic ops: cxx11
|
6 |
+
conf.set('HAVE_CXX11_ATOMIC_PRIMITIVES', 1)
|
7 |
+
elif cc.links(files('meson-cc-tests/atomic-ops-gcc-legacy.c'), name: 'Atomic ops: gcc legacy')
|
8 |
+
conf.set('HAVE_GCC_LEGACY_ATOMICS', 1)
|
9 |
+
-elif cc.has_header('atomic_ops.h')
|
10 |
+
+elif false
|
11 |
+
conf.set('HAVE_LIB_ATOMIC_OPS', 1)
|
12 |
+
elif cc.has_header('libkern/OSAtomic.h')
|
13 |
+
conf.set('HAVE_OS_ATOMIC_OPS', 1)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/portfile.cmake
ADDED
@@ -0,0 +1,90 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(CAIRO_VERSION 1.17.4)
|
2 |
+
|
3 |
+
vcpkg_from_gitlab(
|
4 |
+
GITLAB_URL https://gitlab.freedesktop.org
|
5 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
6 |
+
REPO cairo/cairo
|
7 |
+
REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6
|
8 |
+
SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358
|
9 |
+
HEAD_REF master
|
10 |
+
PATCHES
|
11 |
+
cairo_static_fix.patch
|
12 |
+
disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554
|
13 |
+
)
|
14 |
+
|
15 |
+
if("fontconfig" IN_LIST FEATURES)
|
16 |
+
list(APPEND OPTIONS -Dfontconfig=enabled)
|
17 |
+
else()
|
18 |
+
list(APPEND OPTIONS -Dfontconfig=disabled)
|
19 |
+
endif()
|
20 |
+
|
21 |
+
if("freetype" IN_LIST FEATURES)
|
22 |
+
list(APPEND OPTIONS -Dfreetype=enabled)
|
23 |
+
else()
|
24 |
+
list(APPEND OPTIONS -Dfreetype=disabled)
|
25 |
+
endif()
|
26 |
+
|
27 |
+
if ("x11" IN_LIST FEATURES)
|
28 |
+
if (VCPKG_TARGET_IS_WINDOWS)
|
29 |
+
message(FATAL_ERROR "Feature x11 only support UNIX.")
|
30 |
+
endif()
|
31 |
+
message(WARNING "You will need to install Xorg dependencies to use feature x11:\napt install libx11-dev libxft-dev\n")
|
32 |
+
list(APPEND OPTIONS -Dxlib=enabled)
|
33 |
+
else()
|
34 |
+
list(APPEND OPTIONS -Dxlib=disabled)
|
35 |
+
endif()
|
36 |
+
list(APPEND OPTIONS -Dxcb=disabled)
|
37 |
+
list(APPEND OPTIONS -Dxlib-xcb=disabled)
|
38 |
+
|
39 |
+
if("gobject" IN_LIST FEATURES)
|
40 |
+
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
41 |
+
message(FATAL_ERROR "Feature gobject currently only supports dynamic build.")
|
42 |
+
endif()
|
43 |
+
list(APPEND OPTIONS -Dglib=enabled)
|
44 |
+
else()
|
45 |
+
list(APPEND OPTIONS -Dglib=disabled)
|
46 |
+
endif()
|
47 |
+
|
48 |
+
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
49 |
+
set(ENV{CPP} "cl_cpp_wrapper")
|
50 |
+
endif()
|
51 |
+
|
52 |
+
vcpkg_configure_meson(
|
53 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
54 |
+
OPTIONS ${OPTIONS}
|
55 |
+
-Dtests=disabled
|
56 |
+
-Dzlib=enabled
|
57 |
+
-Dpng=enabled
|
58 |
+
-Dspectre=auto
|
59 |
+
-Dgtk2-utils=disabled
|
60 |
+
-Dsymbol-lookup=disabled
|
61 |
+
)
|
62 |
+
vcpkg_install_meson()
|
63 |
+
|
64 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
65 |
+
|
66 |
+
set(_file "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h")
|
67 |
+
file(READ ${_file} CAIRO_H)
|
68 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
69 |
+
string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}")
|
70 |
+
else()
|
71 |
+
string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "0" CAIRO_H "${CAIRO_H}")
|
72 |
+
endif()
|
73 |
+
file(WRITE ${_file} "${CAIRO_H}")
|
74 |
+
|
75 |
+
vcpkg_copy_pdbs()
|
76 |
+
vcpkg_fixup_pkgconfig()
|
77 |
+
|
78 |
+
#TODO: Fix script
|
79 |
+
#set(TOOLS)
|
80 |
+
#if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/cairo-trace${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
81 |
+
# list(APPEND TOOLS cairo-trace) # sh script which needs to be fixed due to absolute paths in it.
|
82 |
+
#endif()
|
83 |
+
#vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN)
|
84 |
+
|
85 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
86 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
87 |
+
endif()
|
88 |
+
|
89 |
+
# Handle copyright
|
90 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairo/vcpkg.json
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cairo",
|
3 |
+
"version": "1.17.6",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.",
|
6 |
+
"homepage": "https://cairographics.org",
|
7 |
+
"license": "MPL-1.1",
|
8 |
+
"dependencies": [
|
9 |
+
"dirent",
|
10 |
+
"expat",
|
11 |
+
"libpng",
|
12 |
+
"lzo",
|
13 |
+
"pixman",
|
14 |
+
"pthread",
|
15 |
+
{
|
16 |
+
"name": "vcpkg-tool-meson",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
"zlib"
|
20 |
+
],
|
21 |
+
"default-features": [
|
22 |
+
"fontconfig",
|
23 |
+
"freetype"
|
24 |
+
],
|
25 |
+
"features": {
|
26 |
+
"fontconfig": {
|
27 |
+
"description": "build with fontconfig",
|
28 |
+
"dependencies": [
|
29 |
+
"fontconfig"
|
30 |
+
]
|
31 |
+
},
|
32 |
+
"freetype": {
|
33 |
+
"description": "use the freetype font backend",
|
34 |
+
"dependencies": [
|
35 |
+
"freetype"
|
36 |
+
]
|
37 |
+
},
|
38 |
+
"gobject": {
|
39 |
+
"description": "build gobject module",
|
40 |
+
"dependencies": [
|
41 |
+
"glib"
|
42 |
+
]
|
43 |
+
},
|
44 |
+
"x11": {
|
45 |
+
"description": "build with x11 support"
|
46 |
+
}
|
47 |
+
}
|
48 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/build-support-msvc2022.diff
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
commit ed1ce9a630b375b0f43435e34fbe690eb8276178
|
2 |
+
Author: Chun-wei Fan <[email protected]>
|
3 |
+
Date: Wed Nov 10 16:11:04 2021 +0800
|
4 |
+
|
5 |
+
build: Support Visual Studio 2022
|
6 |
+
|
7 |
+
Make these builds distinct from the Visual Studio 2019 builds.
|
8 |
+
|
9 |
+
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
|
10 |
+
index bf2e906..58b7092 100644
|
11 |
+
--- a/MSVC_NMake/detectenv-msvc.mak
|
12 |
+
+++ b/MSVC_NMake/detectenv-msvc.mak
|
13 |
+
@@ -98,9 +98,12 @@ PDBVER = 14
|
14 |
+
!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
|
15 |
+
VSVER_SUFFIX = 1
|
16 |
+
VSVER = 15
|
17 |
+
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
|
18 |
+
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
|
19 |
+
VSVER_SUFFIX = 2
|
20 |
+
VSVER = 16
|
21 |
+
+!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000
|
22 |
+
+VSVER_SUFFIX = 3
|
23 |
+
+VSVER = 17
|
24 |
+
!else
|
25 |
+
VSVER = $(PDBVER)
|
26 |
+
!endif
|
27 |
+
diff --git a/meson.build b/meson.build
|
28 |
+
index 8b18fc2..1fa2da0 100644
|
29 |
+
--- a/meson.build
|
30 |
+
+++ b/meson.build
|
31 |
+
@@ -238,7 +238,9 @@ if is_msvc
|
32 |
+
add_project_arguments(disabled_warning, language: 'cpp')
|
33 |
+
endforeach
|
34 |
+
if use_msvc14x_toolset_ver
|
35 |
+
- if cpp_compiler.version().version_compare('>=19.20')
|
36 |
+
+ if cpp_compiler.version().version_compare('>=19.30')
|
37 |
+
+ msvc14x_toolset_ver = '-vc143'
|
38 |
+
+ elif cpp_compiler.version().version_compare('>=19.20')
|
39 |
+
msvc14x_toolset_ver = '-vc142'
|
40 |
+
elif cpp_compiler.version().version_compare('>=19.10')
|
41 |
+
msvc14x_toolset_ver = '-vc141'
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/portfile.cmake
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(CAIROMM_VERSION 1.16.1)
|
2 |
+
set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757)
|
3 |
+
|
4 |
+
vcpkg_download_distfile(ARCHIVE
|
5 |
+
URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz"
|
6 |
+
FILENAME "cairomm-${CAIROMM_VERSION}.tar.xz"
|
7 |
+
SHA512 ${CAIROMM_HASH}
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_extract_source_archive_ex(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
ARCHIVE ${ARCHIVE}
|
13 |
+
PATCHES
|
14 |
+
build-support-msvc2022.diff
|
15 |
+
)
|
16 |
+
|
17 |
+
vcpkg_configure_meson(
|
18 |
+
SOURCE_PATH ${SOURCE_PATH}
|
19 |
+
OPTIONS
|
20 |
+
-Dbuild-examples=false
|
21 |
+
-Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_install_meson()
|
25 |
+
vcpkg_fixup_pkgconfig()
|
26 |
+
vcpkg_copy_pdbs()
|
27 |
+
|
28 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
29 |
+
|
30 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
31 |
+
|
32 |
+
if(VCPKG_LIBRARY_LINAKGE STREQUAL "static")
|
33 |
+
set(_file "${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h")
|
34 |
+
if(EXISTS "${_file}")
|
35 |
+
vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
|
36 |
+
endif()
|
37 |
+
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h")
|
38 |
+
if(EXISTS "${_file}")
|
39 |
+
vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
|
40 |
+
endif()
|
41 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cairomm/vcpkg.json
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cairomm",
|
3 |
+
"version": "1.16.1",
|
4 |
+
"description": "A C++ wrapper for the cairo graphics library",
|
5 |
+
"homepage": "https://www.cairographics.org",
|
6 |
+
"license": "LGPL-2.0-only",
|
7 |
+
"dependencies": [
|
8 |
+
"cairo",
|
9 |
+
"libsigcpp",
|
10 |
+
{
|
11 |
+
"name": "vcpkg-tool-meson",
|
12 |
+
"host": true
|
13 |
+
}
|
14 |
+
]
|
15 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/calceph/portfile.cmake
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(CALCEPH_VERSION "3.5.1")
|
2 |
+
set(CALCEPH_HASH 5e83bb46b92a0b53f2cae717363cb4497d5c9cb57b3903e70d9e2c50176ca7d234212d0209fd3fcb5feebfd0980313be17e2ad4e69482504bfe8686f93216b67)
|
3 |
+
|
4 |
+
vcpkg_download_distfile(ARCHIVE
|
5 |
+
URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz"
|
6 |
+
FILENAME "calceph-${CALCEPH_VERSION}.tar.gz"
|
7 |
+
SHA512 ${CALCEPH_HASH}
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_extract_source_archive_ex(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
ARCHIVE ${ARCHIVE}
|
13 |
+
)
|
14 |
+
|
15 |
+
if (VCPKG_TARGET_IS_WINDOWS)
|
16 |
+
|
17 |
+
vcpkg_install_nmake(
|
18 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
19 |
+
OPTIONS
|
20 |
+
OPTIONS_DEBUG
|
21 |
+
DESTDIR="${CURRENT_INSTALLED_DIR}/calceph/debug"
|
22 |
+
CFLAGS="${VCPKG_C_FLAGS_DEBUG} "
|
23 |
+
OPTIONS_RELEASE
|
24 |
+
DESTDIR="${CURRENT_INSTALLED_DIR}/calceph"
|
25 |
+
CFLAGS="${VCPKG_C_FLAGS_RELEASE} "
|
26 |
+
)
|
27 |
+
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
28 |
+
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
29 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
30 |
+
file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
31 |
+
endif()
|
32 |
+
file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph")
|
33 |
+
|
34 |
+
else() # Build in UNIX
|
35 |
+
vcpkg_configure_make(
|
36 |
+
AUTOCONFIG
|
37 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
38 |
+
OPTIONS ${OPTIONS}
|
39 |
+
--enable-fortran=no
|
40 |
+
--enable-thread=yes
|
41 |
+
)
|
42 |
+
|
43 |
+
vcpkg_install_make()
|
44 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
45 |
+
|
46 |
+
endif()
|
47 |
+
|
48 |
+
file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst)
|
49 |
+
file(INSTALL "${SOURCE_PATH}/COPYING_CECILL_B.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME copyright)
|
50 |
+
file(INSTALL "${SOURCE_PATH}/doc/calceph_c.pdf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME calceph_c.pdf)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/calceph/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "calceph",
|
3 |
+
"version": "3.5.1",
|
4 |
+
"description": "C library to access the binary planetary ephemeris files.",
|
5 |
+
"homepage": "https://www.imcce.fr/inpop/calceph/",
|
6 |
+
"documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html",
|
7 |
+
"license": "CECILL-2.1 OR CECILL-B OR CECILL-C",
|
8 |
+
"supports": "!uwp"
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/camport3/portfile.cmake
ADDED
@@ -0,0 +1,73 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO percipioxyz/camport3
|
4 |
+
REF v1.5.3
|
5 |
+
SHA512 efa41e75b4ed7147f94270765138aa226a92ec51c99157776e916ec178ad2a9fe55aa6e6e746be46e2f2178852f4c4f9323b515f5a1b151ac70c21f8f923d901
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
|
10 |
+
file(COPY
|
11 |
+
${SOURCE_PATH}/include/TYApi.h
|
12 |
+
${SOURCE_PATH}/include/TYCoordinateMapper.h
|
13 |
+
${SOURCE_PATH}/include/TYImageProc.h
|
14 |
+
${SOURCE_PATH}/include/TyIsp.h
|
15 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
16 |
+
|
17 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
18 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
19 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
|
20 |
+
file(COPY
|
21 |
+
${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib
|
22 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
23 |
+
)
|
24 |
+
file(COPY
|
25 |
+
${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll
|
26 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
|
27 |
+
)
|
28 |
+
endif()
|
29 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
30 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
|
31 |
+
file(COPY
|
32 |
+
${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.lib
|
33 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
34 |
+
)
|
35 |
+
file(COPY
|
36 |
+
${SOURCE_PATH}/lib/win/hostapp/${VCPKG_TARGET_ARCHITECTURE}/tycam.dll
|
37 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
|
38 |
+
)
|
39 |
+
endif()
|
40 |
+
|
41 |
+
elseif(VCPKG_TARGET_IS_LINUX)
|
42 |
+
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
43 |
+
set (CAMPORT3_ARCH "Aarch64")
|
44 |
+
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
45 |
+
set (CAMPORT3_ARCH "armv7hf")
|
46 |
+
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
47 |
+
set (CAMPORT3_ARCH "i686")
|
48 |
+
else()
|
49 |
+
set (CAMPORT3_ARCH ${VCPKG_TARGET_ARCHITECTURE})
|
50 |
+
endif()
|
51 |
+
|
52 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
53 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
|
54 |
+
file(COPY
|
55 |
+
${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so
|
56 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
57 |
+
)
|
58 |
+
endif()
|
59 |
+
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
60 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
|
61 |
+
file(COPY
|
62 |
+
${SOURCE_PATH}/lib/linux/lib_${CAMPORT3_ARCH}/libtycam.so
|
63 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
64 |
+
)
|
65 |
+
endif()
|
66 |
+
|
67 |
+
endif()
|
68 |
+
|
69 |
+
file(INSTALL
|
70 |
+
${SOURCE_PATH}/LICENSE
|
71 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
|
72 |
+
RENAME copyright
|
73 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/camport3/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "camport3",
|
3 |
+
"version-string": "1.5.3",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "percipio.xyz cameras SDK",
|
6 |
+
"homepage": "https://github.com/percipioxyz/camport3",
|
7 |
+
"supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/capnproto/portfile.cmake
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO capnproto/capnproto
|
6 |
+
REF v0.9.1
|
7 |
+
SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
12 |
+
FEATURES
|
13 |
+
"openssl" OPENSSL_FEATURE
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_cmake_configure(
|
17 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
18 |
+
OPTIONS
|
19 |
+
-DBUILD_TESTING=OFF
|
20 |
+
"-DWITH_OPENSSL=${OPENSSL_FEATURE}"
|
21 |
+
)
|
22 |
+
|
23 |
+
vcpkg_cmake_install()
|
24 |
+
|
25 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CapnProto)
|
26 |
+
|
27 |
+
vcpkg_copy_tools(TOOL_NAMES capnp capnpc-c++ capnpc-capnp AUTO_CLEAN)
|
28 |
+
|
29 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
|
30 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
|
31 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
32 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
33 |
+
|
34 |
+
# Handle copyright
|
35 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
36 |
+
|
37 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/capnproto/vcpkg.json
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "capnproto",
|
3 |
+
"version": "0.9.1",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Data interchange format and capability-based RPC system",
|
6 |
+
"homepage": "https://capnproto.org/",
|
7 |
+
"supports": "!windows | (!uwp & !arm)",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
},
|
17 |
+
"zlib"
|
18 |
+
],
|
19 |
+
"features": {
|
20 |
+
"openssl": {
|
21 |
+
"description": "Build libkj-tls by linking against OpenSSL.",
|
22 |
+
"dependencies": [
|
23 |
+
"openssl"
|
24 |
+
]
|
25 |
+
}
|
26 |
+
}
|
27 |
+
}
|