Spaces:
Sleeping
Sleeping
ab2457262594d293e16d6868a5e8c983c39d4a4b84419d52b2fe78601cf70569
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/CMakeLists.patch +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/OsgMacroUtils.patch +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/fix-static-install.patch +57 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/portfile.cmake +37 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/use-lib.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/vcpkg.json +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/portfile.cmake +163 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/remove-prefix.patch +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/static.patch +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/use-boost-asio.patch +92 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/vcpkg.json +124 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/StaticOSG.patch +84 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/blend2d-fix.patch +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-dependency-osg.patch +176 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-gcc11-compilation.patch +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-imgui.patch +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/make-all-find-packages-required.patch +115 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/portfile.cmake +90 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/remove-tool-debug-suffix.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/vcpkg.json +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/CMakeLists.txt +89 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/Config.cmake.in +5 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/portfile.cmake +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/otl/portfile.cmake +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/otl/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/outcome-prune-sources.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/portfile.cmake +77 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/vcpkg.json +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv/portfile.cmake +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv2/portfile.cmake +27 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv2/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/disable-C4701.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/disable-md-override.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/find-tbb.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/portfile.cmake +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/vcpkg.json +21 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/fix-install-path.patch +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/portfile.cmake +37 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/remove_compiler_options.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/fix-dependency.patch +84 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/fix-include-path.patch +249 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/portfile.cmake +67 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/vcpkg.json +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/palsigslot/portfile.cmake +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/palsigslot/vcpkg.json +16 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/CMakeLists.patch
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/osgQOpenGL/CMakeLists.txt b/src/osgQOpenGL/CMakeLists.txt
|
2 |
+
--- a/src/osgQOpenGL/CMakeLists.txt
|
3 |
+
+++ b/src/osgQOpenGL/CMakeLists.txt
|
4 |
+
@@ -14,7 +14,11 @@
|
5 |
+
${HEADER_PATH}/OSGRenderer
|
6 |
+
)
|
7 |
+
|
8 |
+
- qt5_wrap_cpp(SOURCES_H_MOC ${SOURCE_H} #[[OPTIONS ${MOC_OPTIONS}]])
|
9 |
+
+ FOREACH(HEADER_FILE ${SOURCE_H})
|
10 |
+
+ get_filename_component(HEADER_FILE_NAME "${CMAKE_CURRENT_LIST_DIR}/${HEADER_FILE}" NAME)
|
11 |
+
+ qt5_wrap_cpp(HEADER_FILE_MOC ${HEADER_FILE} OPTIONS "-f<osgQOpenGL/${HEADER_FILE_NAME}>")
|
12 |
+
+ LIST(APPEND SOURCES_H_MOC ${HEADER_FILE_MOC})
|
13 |
+
+ ENDFOREACH()
|
14 |
+
|
15 |
+
SET(TARGET_H
|
16 |
+
${SOURCE_H}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/OsgMacroUtils.patch
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/CMakeModules/OsgMacroUtils.cmake
|
2 |
+
+++ b/CMakeModules/OsgMacroUtils.cmake
|
3 |
+
@@ -92,7 +92,7 @@ MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
|
4 |
+
ENDIF()
|
5 |
+
|
6 |
+
LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES})
|
7 |
+
- LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
|
8 |
+
+ #LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
|
9 |
+
IF(OPENSCENEGRAPH_SONAMES)
|
10 |
+
SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION})
|
11 |
+
ENDIF(OPENSCENEGRAPH_SONAMES)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/fix-static-install.patch
ADDED
@@ -0,0 +1,57 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake
|
2 |
+
index eb26ba2..14b8bca 100644
|
3 |
+
--- a/CMakeModules/ModuleInstall.cmake
|
4 |
+
+++ b/CMakeModules/ModuleInstall.cmake
|
5 |
+
@@ -40,10 +40,10 @@
|
6 |
+
ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev
|
7 |
+
)
|
8 |
+
|
9 |
+
-IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
10 |
+
+IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
11 |
+
GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX)
|
12 |
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph)
|
13 |
+
-ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
14 |
+
+ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
15 |
+
|
16 |
+
IF(NOT OSG_COMPILE_FRAMEWORKS)
|
17 |
+
INSTALL (
|
18 |
+
diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
|
19 |
+
index 5688f8f..329f862 100644
|
20 |
+
--- a/CMakeModules/OsgMacroUtils.cmake
|
21 |
+
+++ b/CMakeModules/OsgMacroUtils.cmake
|
22 |
+
@@ -333,9 +333,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
|
23 |
+
RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
|
24 |
+
ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
|
25 |
+
LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
|
26 |
+
- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
27 |
+
+ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
28 |
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
|
29 |
+
- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
30 |
+
+ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
31 |
+
ELSE(WIN32)
|
32 |
+
INSTALL(TARGETS ${TARGET_TARGETNAME}
|
33 |
+
RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
|
34 |
+
@@ -436,9 +436,9 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
|
35 |
+
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
|
36 |
+
ELSE(APPLE)
|
37 |
+
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph )
|
38 |
+
- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
39 |
+
+ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
40 |
+
INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph)
|
41 |
+
- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
42 |
+
+ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
43 |
+
ENDIF(APPLE)
|
44 |
+
|
45 |
+
ENDMACRO(SETUP_APPLICATION)
|
46 |
+
@@ -468,9 +468,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
|
47 |
+
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
|
48 |
+
ELSE(APPLE)
|
49 |
+
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
|
50 |
+
- IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
51 |
+
+ IF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
52 |
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_BUILD_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples)
|
53 |
+
- ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
54 |
+
+ ENDIF(MSVC AND NOT CMAKE_BUILD_TYPE STREQUAL "Release" AND DYNAMIC_OPENSCENEGRAPH)
|
55 |
+
ENDIF(APPLE)
|
56 |
+
|
57 |
+
ENDMACRO(SETUP_EXAMPLE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/portfile.cmake
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO openscenegraph/osgQt
|
4 |
+
REF 2cb70673a4e83a618290e7ee66d52402a94ec3f6
|
5 |
+
SHA512 29aeb5b31e70d5b12e69de7970b36ab7d1541c984873384a46c6468394e8562688c46ef39179820990817c94f283c7836c2c6ff207eefe385086d850ba3f8306
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
OsgMacroUtils.patch
|
9 |
+
fix-static-install.patch
|
10 |
+
CMakeLists.patch
|
11 |
+
use-lib.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
if(VCPKG_TARGET_IS_OSX)
|
15 |
+
string(APPEND VCPKG_CXX_FLAGS " -stdlib=libc++")
|
16 |
+
string(APPEND VCPKG_C_FLAGS "") # both must be set
|
17 |
+
endif()
|
18 |
+
|
19 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
20 |
+
set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=ON)
|
21 |
+
else()
|
22 |
+
set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=OFF)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
vcpkg_cmake_configure(
|
26 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
27 |
+
OPTIONS
|
28 |
+
${OPTIONS}
|
29 |
+
-DBUILD_OSG_EXAMPLES=OFF
|
30 |
+
-DOSG_BUILD_APPLICATION_BUNDLES=OFF
|
31 |
+
)
|
32 |
+
|
33 |
+
vcpkg_cmake_install()
|
34 |
+
vcpkg_fixup_pkgconfig()
|
35 |
+
|
36 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
37 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/use-lib.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 66e989a..3569cec 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -467,7 +467,7 @@ ENDIF()
|
6 |
+
|
7 |
+
IF(UNIX AND NOT WIN32 AND NOT APPLE)
|
8 |
+
IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
9 |
+
- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
|
10 |
+
+ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement")
|
11 |
+
MARK_AS_ADVANCED(LIB_POSTFIX)
|
12 |
+
ENDIF()
|
13 |
+
ENDIF()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg-qt/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "osg-qt",
|
3 |
+
"version-string": "Qt5",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "osgQt - Qt project for making use of OpenSceneGraph(OSG)",
|
6 |
+
"dependencies": [
|
7 |
+
"osg",
|
8 |
+
{
|
9 |
+
"name": "qt5-base",
|
10 |
+
"default-features": false
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/portfile.cmake
ADDED
@@ -0,0 +1,163 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(OSG_VER 3.6.5)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO openscenegraph/OpenSceneGraph
|
6 |
+
REF OpenSceneGraph-${OSG_VER}
|
7 |
+
SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
collada.patch
|
11 |
+
static.patch
|
12 |
+
fix-sdl.patch
|
13 |
+
fix-example-application.patch
|
14 |
+
disable-present3d-staticview-in-linux.patch #Due to some link error we cannot solve yet, disable them in linux.
|
15 |
+
fix-curl.patch
|
16 |
+
remove-prefix.patch # Remove this patch when cmake fix Findosg_functions.cmake
|
17 |
+
fix-liblas.patch
|
18 |
+
fix-nvtt.patch
|
19 |
+
use-boost-asio.patch
|
20 |
+
fix-dependency-coin.patch
|
21 |
+
osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode
|
22 |
+
)
|
23 |
+
|
24 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
25 |
+
set(OSG_DYNAMIC OFF)
|
26 |
+
else()
|
27 |
+
set(OSG_DYNAMIC ON)
|
28 |
+
endif()
|
29 |
+
|
30 |
+
file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake)
|
31 |
+
|
32 |
+
set(OSG_USE_UTF8_FILENAME ON)
|
33 |
+
if (NOT VCPKG_TARGET_IS_WINDOWS)
|
34 |
+
message("Build osg requires gcc with version higher than 4.7.")
|
35 |
+
# Enable OSG_USE_UTF8_FILENAME will call some windows-only functions.
|
36 |
+
set(OSG_USE_UTF8_FILENAME OFF)
|
37 |
+
endif()
|
38 |
+
|
39 |
+
set(OPTIONS)
|
40 |
+
if(NOT "collada" IN_LIST FEATURES)
|
41 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=ON)
|
42 |
+
endif()
|
43 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=ON)
|
44 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON)
|
45 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON)
|
46 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON)
|
47 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON)
|
48 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=ON)
|
49 |
+
|
50 |
+
# Due to nvtt CRT linkage error, we can only enable static builds here
|
51 |
+
set(ENABLE_NVTT ON)
|
52 |
+
if (VCPKG_TARGET_IS_WINDOWS AND OSG_DYNAMIC)
|
53 |
+
set(ENABLE_NVTT OFF)
|
54 |
+
endif()
|
55 |
+
list(APPEND OPTIONS -DENABLE_NVTT=${ENABLE_NVTT})
|
56 |
+
|
57 |
+
if (VCPKG_TARGET_IS_WINDOWS)
|
58 |
+
list(APPEND OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_FONTCONFIG=ON)
|
59 |
+
list(APPEND OPTIONS -DOSG_TEXT_USE_FONTCONFIG=OFF)
|
60 |
+
endif()
|
61 |
+
|
62 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
63 |
+
tools BUILD_OSG_APPLICATIONS
|
64 |
+
examples BUILD_OSG_EXAMPLES
|
65 |
+
plugins BUILD_OSG_PLUGINS
|
66 |
+
packages BUILD_OSG_PACKAGES
|
67 |
+
docs BUILD_DOCUMENTATION
|
68 |
+
docs BUILD_REF_DOCS_SEARCHENGINE
|
69 |
+
docs BUILD_REF_DOCS_TAGFILE
|
70 |
+
)
|
71 |
+
|
72 |
+
set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE ON)
|
73 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
74 |
+
set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE OFF)
|
75 |
+
endif()
|
76 |
+
|
77 |
+
vcpkg_configure_cmake(
|
78 |
+
SOURCE_PATH ${SOURCE_PATH}
|
79 |
+
OPTIONS ${FEATURE_OPTIONS}
|
80 |
+
-DOSG_USE_UTF8_FILENAME=${OSG_USE_UTF8_FILENAME}
|
81 |
+
-DDYNAMIC_OPENSCENEGRAPH=${OSG_DYNAMIC}
|
82 |
+
-DDYNAMIC_OPENTHREADS=${OSG_DYNAMIC}
|
83 |
+
-DBUILD_OSG_PLUGIN_DICOM=OFF
|
84 |
+
-DBUILD_OSG_PLUGIN_OPENCASCADE=OFF
|
85 |
+
-DBUILD_OSG_PLUGIN_INVENTOR=OFF
|
86 |
+
-DBUILD_OSG_PLUGIN_FBX=OFF
|
87 |
+
-DBUILD_OSG_PLUGIN_DIRECTSHOW=OFF
|
88 |
+
-DBUILD_OSG_PLUGIN_QTKIT=OFF
|
89 |
+
-DBUILD_OSG_PLUGIN_SVG=OFF
|
90 |
+
-DBUILD_OSG_PLUGIN_VNC=OFF
|
91 |
+
-DBUILD_OSG_PLUGIN_LUA=OFF
|
92 |
+
-DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=${BUILD_OSG_PLUGIN_RESTHTTPDEVICE}
|
93 |
+
-DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF
|
94 |
+
-DBUILD_DASHBOARD_REPORTS=OFF
|
95 |
+
-DCMAKE_CXX_STANDARD=11
|
96 |
+
${OPTIONS}
|
97 |
+
)
|
98 |
+
|
99 |
+
vcpkg_install_cmake()
|
100 |
+
|
101 |
+
vcpkg_copy_pdbs()
|
102 |
+
|
103 |
+
# handle osg tools and plugins
|
104 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
105 |
+
|
106 |
+
set(OSG_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
107 |
+
|
108 |
+
file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
109 |
+
if (OSG_TOOLS)
|
110 |
+
file(MAKE_DIRECTORY ${OSG_TOOL_PATH})
|
111 |
+
file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH})
|
112 |
+
file(REMOVE_RECURSE ${OSG_TOOLS})
|
113 |
+
file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
114 |
+
file(REMOVE_RECURSE ${OSG_TOOLS_DBG})
|
115 |
+
endif()
|
116 |
+
file(GLOB OSG_TOOLS ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX})
|
117 |
+
if (OSG_TOOLS)
|
118 |
+
file(COPY ${OSG_TOOLS} DESTINATION ${OSG_TOOL_PATH})
|
119 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/OpenSceneGraph)
|
120 |
+
endif()
|
121 |
+
|
122 |
+
|
123 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
124 |
+
file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*)
|
125 |
+
if (OSG_PLUGINS_DBG)
|
126 |
+
file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER})
|
127 |
+
endif()
|
128 |
+
file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*)
|
129 |
+
if (OSG_PLUGINS_REL)
|
130 |
+
if (NOT EXISTS ${OSG_TOOL_PATH})
|
131 |
+
file(MAKE_DIRECTORY ${OSG_TOOL_PATH})
|
132 |
+
endif()
|
133 |
+
file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER})
|
134 |
+
endif()
|
135 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/)
|
136 |
+
endif()
|
137 |
+
|
138 |
+
file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/*)
|
139 |
+
if (OSG_PLUGINS_DBG)
|
140 |
+
file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}/osgPlugins-${OSG_VER})
|
141 |
+
endif()
|
142 |
+
|
143 |
+
file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/*)
|
144 |
+
if (OSG_PLUGINS_REL)
|
145 |
+
if (NOT EXISTS ${OSG_TOOL_PATH})
|
146 |
+
file(MAKE_DIRECTORY ${OSG_TOOL_PATH})
|
147 |
+
endif()
|
148 |
+
file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-${OSG_VER})
|
149 |
+
endif()
|
150 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/ ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-${OSG_VER}/)
|
151 |
+
|
152 |
+
#Cleanup
|
153 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
154 |
+
|
155 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
156 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
157 |
+
endif()
|
158 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/)
|
159 |
+
|
160 |
+
# Handle copyright
|
161 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
162 |
+
|
163 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/remove-prefix.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake
|
2 |
+
index bb3be63..356edcd 100644
|
3 |
+
--- a/CMakeModules/ModuleInstall.cmake
|
4 |
+
+++ b/CMakeModules/ModuleInstall.cmake
|
5 |
+
@@ -21,7 +21,7 @@ SOURCE_GROUP(
|
6 |
+
FILES ${TARGET_H}
|
7 |
+
)
|
8 |
+
|
9 |
+
-IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
|
10 |
+
+IF(0)
|
11 |
+
HANDLE_MSVC_DLL()
|
12 |
+
ENDIF()
|
13 |
+
|
14 |
+
diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt
|
15 |
+
index 84550bd..0e816f7 100644
|
16 |
+
--- a/src/OpenThreads/win32/CMakeLists.txt
|
17 |
+
+++ b/src/OpenThreads/win32/CMakeLists.txt
|
18 |
+
@@ -39,7 +39,7 @@ LINK_DIRECTORIES(
|
19 |
+
${CMAKE_CURRENT_BINARY_DIR}
|
20 |
+
)
|
21 |
+
|
22 |
+
-IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
|
23 |
+
+IF(0)
|
24 |
+
HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION})
|
25 |
+
ENDIF()
|
26 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/static.patch
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
--- a/src/osgPlugins/curl/CMakeLists.txt
|
2 |
+
+++ b/src/osgPlugins/curl/CMakeLists.txt
|
3 |
+
@@ -35,3 +35,3 @@
|
4 |
+
ADD_DEFINITIONS(-DCURL_STATICLIB)
|
5 |
+
- SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32)
|
6 |
+
+ SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32 winmm wldap32 crypt32)
|
7 |
+
ENDIF()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/use-boost-asio.patch
ADDED
@@ -0,0 +1,92 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/FindAsio.cmake b/CMakeModules/FindAsio.cmake
|
2 |
+
index 433d5c7..04a0edf 100644
|
3 |
+
--- a/CMakeModules/FindAsio.cmake
|
4 |
+
+++ b/CMakeModules/FindAsio.cmake
|
5 |
+
@@ -1,22 +1,7 @@
|
6 |
+
# Locate ASIO-headers (http://think-async.com/Asio)
|
7 |
+
-# This module defines
|
8 |
+
-# ASIO_FOUND, if false, do not try to link to gdal
|
9 |
+
-# ASIO_INCLUDE_DIR, where to find the headers
|
10 |
+
-#
|
11 |
+
# Created by Stephan Maximilian Huber
|
12 |
+
|
13 |
+
-FIND_PATH(ASIO_INCLUDE_DIR
|
14 |
+
- NAMES
|
15 |
+
- asio.hpp
|
16 |
+
- PATHS
|
17 |
+
- /usr/include
|
18 |
+
- /usr/local/include
|
19 |
+
-)
|
20 |
+
-
|
21 |
+
-SET(ASIO_FOUND "NO")
|
22 |
+
-IF(ASIO_INCLUDE_DIR)
|
23 |
+
- FIND_PACKAGE( Boost 1.37 )
|
24 |
+
- IF(Boost_FOUND)
|
25 |
+
- SET(ASIO_FOUND "YES")
|
26 |
+
- ENDIF()
|
27 |
+
+FIND_PACKAGE( Boost 1.37 COMPONENTS asio )
|
28 |
+
+IF(Boost_FOUND)
|
29 |
+
+ SET(ASIO_FOUND "YES")
|
30 |
+
ENDIF()
|
31 |
+
diff --git a/src/osgPlugins/RestHttpDevice/CMakeLists.txt b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
|
32 |
+
index 8464b9d..073e8ed 100644
|
33 |
+
--- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt
|
34 |
+
+++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt
|
35 |
+
@@ -1,5 +1,4 @@
|
36 |
+
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
|
37 |
+
-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
|
38 |
+
|
39 |
+
SET(TARGET_SRC
|
40 |
+
connection.cpp
|
41 |
+
diff --git a/src/osgPlugins/RestHttpDevice/connection.hpp b/src/osgPlugins/RestHttpDevice/connection.hpp
|
42 |
+
index 99f3a93..b205759 100644
|
43 |
+
--- a/src/osgPlugins/RestHttpDevice/connection.hpp
|
44 |
+
+++ b/src/osgPlugins/RestHttpDevice/connection.hpp
|
45 |
+
@@ -11,7 +11,7 @@
|
46 |
+
#ifndef HTTP_SERVER_CONNECTION_HPP
|
47 |
+
#define HTTP_SERVER_CONNECTION_HPP
|
48 |
+
|
49 |
+
-#include <asio.hpp>
|
50 |
+
+#include <boost/asio.hpp>
|
51 |
+
#include <boost/array.hpp>
|
52 |
+
#include <boost/noncopyable.hpp>
|
53 |
+
#include <boost/shared_ptr.hpp>
|
54 |
+
diff --git a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
|
55 |
+
index 1d363a8..b6e7195 100644
|
56 |
+
--- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
|
57 |
+
+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
|
58 |
+
@@ -11,7 +11,7 @@
|
59 |
+
#ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP
|
60 |
+
#define HTTP_SERVER_IO_SERVICE_POOL_HPP
|
61 |
+
|
62 |
+
-#include <asio.hpp>
|
63 |
+
+#include <boost/asio.hpp>
|
64 |
+
#include <vector>
|
65 |
+
#include <boost/noncopyable.hpp>
|
66 |
+
#include <boost/shared_ptr.hpp>
|
67 |
+
diff --git a/src/osgPlugins/RestHttpDevice/reply.hpp b/src/osgPlugins/RestHttpDevice/reply.hpp
|
68 |
+
index 89f264a..b63d0b9 100644
|
69 |
+
--- a/src/osgPlugins/RestHttpDevice/reply.hpp
|
70 |
+
+++ b/src/osgPlugins/RestHttpDevice/reply.hpp
|
71 |
+
@@ -13,7 +13,7 @@
|
72 |
+
|
73 |
+
#include <string>
|
74 |
+
#include <vector>
|
75 |
+
-#include <asio.hpp>
|
76 |
+
+#include <boost/asio.hpp>
|
77 |
+
#include "header.hpp"
|
78 |
+
|
79 |
+
namespace http {
|
80 |
+
diff --git a/src/osgPlugins/RestHttpDevice/server.hpp b/src/osgPlugins/RestHttpDevice/server.hpp
|
81 |
+
index a14f263..91c4b62 100644
|
82 |
+
--- a/src/osgPlugins/RestHttpDevice/server.hpp
|
83 |
+
+++ b/src/osgPlugins/RestHttpDevice/server.hpp
|
84 |
+
@@ -11,7 +11,7 @@
|
85 |
+
#ifndef HTTP_SERVER_SERVER_HPP
|
86 |
+
#define HTTP_SERVER_SERVER_HPP
|
87 |
+
|
88 |
+
-#include <asio.hpp>
|
89 |
+
+#include <boost/asio.hpp>
|
90 |
+
#include <string>
|
91 |
+
#include <vector>
|
92 |
+
#include <boost/noncopyable.hpp>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osg/vcpkg.json
ADDED
@@ -0,0 +1,124 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "osg",
|
3 |
+
"version-string": "3.6.5",
|
4 |
+
"port-version": 11,
|
5 |
+
"description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.",
|
6 |
+
"homepage": "https://github.com/openscenegraph/OpenSceneGraph",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "expat",
|
10 |
+
"platform": "windows"
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "fontconfig",
|
14 |
+
"platform": "!windows"
|
15 |
+
},
|
16 |
+
{
|
17 |
+
"name": "openimageio",
|
18 |
+
"platform": "osx"
|
19 |
+
},
|
20 |
+
"zlib"
|
21 |
+
],
|
22 |
+
"features": {
|
23 |
+
"collada": {
|
24 |
+
"description": "Support for Collada (.dae) files",
|
25 |
+
"dependencies": [
|
26 |
+
"collada-dom"
|
27 |
+
]
|
28 |
+
},
|
29 |
+
"docs": {
|
30 |
+
"description": "Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads"
|
31 |
+
},
|
32 |
+
"examples": {
|
33 |
+
"description": "Enable to build OSG Examples",
|
34 |
+
"dependencies": [
|
35 |
+
"freetype",
|
36 |
+
{
|
37 |
+
"name": "libiconv",
|
38 |
+
"platform": "windows"
|
39 |
+
},
|
40 |
+
"sdl1",
|
41 |
+
"sdl2"
|
42 |
+
]
|
43 |
+
},
|
44 |
+
"packages": {
|
45 |
+
"description": "Set to ON to generate CPack configuration files and packaging targets"
|
46 |
+
},
|
47 |
+
"plugins": {
|
48 |
+
"description": "Build OSG Plugins - Disable for compile testing examples on a time limit",
|
49 |
+
"dependencies": [
|
50 |
+
{
|
51 |
+
"name": "boost-asio",
|
52 |
+
"platform": "!windows"
|
53 |
+
},
|
54 |
+
{
|
55 |
+
"name": "boost-bind",
|
56 |
+
"platform": "!windows"
|
57 |
+
},
|
58 |
+
{
|
59 |
+
"name": "boost-core",
|
60 |
+
"platform": "!windows"
|
61 |
+
},
|
62 |
+
{
|
63 |
+
"name": "boost-lexical-cast",
|
64 |
+
"platform": "!windows"
|
65 |
+
},
|
66 |
+
{
|
67 |
+
"name": "boost-logic",
|
68 |
+
"platform": "!windows"
|
69 |
+
},
|
70 |
+
{
|
71 |
+
"name": "boost-smart-ptr",
|
72 |
+
"platform": "!windows"
|
73 |
+
},
|
74 |
+
{
|
75 |
+
"name": "boost-tuple",
|
76 |
+
"platform": "!windows"
|
77 |
+
},
|
78 |
+
"coin",
|
79 |
+
"curl",
|
80 |
+
"freetype",
|
81 |
+
"gdal",
|
82 |
+
{
|
83 |
+
"name": "giflib",
|
84 |
+
"platform": "windows"
|
85 |
+
},
|
86 |
+
"ilmbase",
|
87 |
+
"jasper",
|
88 |
+
"libgta",
|
89 |
+
{
|
90 |
+
"name": "libiconv",
|
91 |
+
"platform": "windows"
|
92 |
+
},
|
93 |
+
"libjpeg-turbo",
|
94 |
+
"liblas",
|
95 |
+
"libpng",
|
96 |
+
{
|
97 |
+
"name": "libxml2",
|
98 |
+
"platform": "windows"
|
99 |
+
},
|
100 |
+
{
|
101 |
+
"name": "nvtt",
|
102 |
+
"platform": "!x86"
|
103 |
+
},
|
104 |
+
"openexr",
|
105 |
+
"sdl1",
|
106 |
+
"tiff"
|
107 |
+
]
|
108 |
+
},
|
109 |
+
"tools": {
|
110 |
+
"description": "Enable to build OSG Applications (e.g. osgviewer)",
|
111 |
+
"dependencies": [
|
112 |
+
"curl",
|
113 |
+
"freetype",
|
114 |
+
{
|
115 |
+
"name": "libiconv",
|
116 |
+
"platform": "windows"
|
117 |
+
},
|
118 |
+
"libjpeg-turbo",
|
119 |
+
"libpng",
|
120 |
+
"sdl1"
|
121 |
+
]
|
122 |
+
}
|
123 |
+
}
|
124 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/StaticOSG.patch
ADDED
@@ -0,0 +1,84 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 4e719ceacdc8df729f3296f62c9f50075c862967 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Ankur Verma <[email protected]>
|
3 |
+
Date: Sun, 27 Dec 2020 22:26:32 -0800
|
4 |
+
Subject: [PATCH] StaticOSG
|
5 |
+
|
6 |
+
---
|
7 |
+
CMakeLists.txt | 9 ++++++
|
8 |
+
CMakeModules/FindGEOS.cmake | 29 +++++++++++++++++++++++++++--
|
9 |
+
2 files changed, 36 insertions(+), 2 deletions(-)
|
10 |
+
|
11 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
12 |
+
index 049e37e..d75a3b9 100644
|
13 |
+
--- a/CMakeLists.txt
|
14 |
+
+++ b/CMakeLists.txt
|
15 |
+
@@ -266,6 +266,15 @@ ELSE()
|
16 |
+
SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC")
|
17 |
+
ENDIF()
|
18 |
+
|
19 |
+
+IF(NOT OSGEARTH_BUILD_SHARED_LIBS)
|
20 |
+
+ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC)
|
21 |
+
+ENDIF()
|
22 |
+
+
|
23 |
+
+OPTION(OSG_IS_STATIC "Set to ON to build OSG for static linking. Use OFF for dynamic." OFF)
|
24 |
+
+IF (OSG_IS_STATIC)
|
25 |
+
+ ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
26 |
+
+ LINK_LIBRARIES(${CMAKE_DL_LIBS})
|
27 |
+
+ENDIF(OSG_IS_STATIC)
|
28 |
+
|
29 |
+
# OE Libraries
|
30 |
+
ADD_SUBDIRECTORY(src)
|
31 |
+
diff --git a/CMakeModules/FindGEOS.cmake b/CMakeModules/FindGEOS.cmake
|
32 |
+
index e85f922..b1bbfed 100644
|
33 |
+
--- a/CMakeModules/FindGEOS.cmake
|
34 |
+
+++ b/CMakeModules/FindGEOS.cmake
|
35 |
+
@@ -65,7 +65,7 @@ FIND_LIBRARY(GEOS_LIBRARY
|
36 |
+
)
|
37 |
+
|
38 |
+
FIND_LIBRARY(GEOS_LIBRARY_DEBUG
|
39 |
+
- NAMES geos_cd geos_i_d geosd
|
40 |
+
+ NAMES geos_cd geos_i_d
|
41 |
+
PATHS
|
42 |
+
${GEOS_DIR}/lib
|
43 |
+
$ENV{GEOS_DIR}
|
44 |
+
@@ -74,7 +74,7 @@ FIND_LIBRARY(GEOS_LIBRARY_DEBUG
|
45 |
+
)
|
46 |
+
|
47 |
+
FIND_LIBRARY(GEOS_LIBRARY_DEBUG
|
48 |
+
- NAMES geos_cd geos_i_d geosd
|
49 |
+
+ NAMES geos_cd geos_i_d
|
50 |
+
PATHS
|
51 |
+
~/Library/Frameworks
|
52 |
+
/Library/Frameworks
|
53 |
+
@@ -92,3 +92,28 @@ SET(GEOS_FOUND "NO")
|
54 |
+
IF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR)
|
55 |
+
SET(GEOS_FOUND "YES")
|
56 |
+
ENDIF(GEOS_LIBRARY AND GEOS_INCLUDE_DIR)
|
57 |
+
+
|
58 |
+
+OPTION(GEOS_IS_STATIC "Set to ON to build GEOS for static linking. Use OFF for dynamic." OFF)
|
59 |
+
+IF (GEOS_IS_STATIC)
|
60 |
+
+ FIND_LIBRARY(GEOS_CXX_LIBRARY
|
61 |
+
+ NAMES geos
|
62 |
+
+ PATHS
|
63 |
+
+ ${GEOS_DIR}/lib
|
64 |
+
+ $ENV{GEOS_DIR}
|
65 |
+
+ NO_DEFAULT_PATH
|
66 |
+
+ PATH_SUFFIXES lib64 lib
|
67 |
+
+ )
|
68 |
+
+
|
69 |
+
+ FIND_LIBRARY(GEOS_CXX_LIBRARY_DEBUG
|
70 |
+
+ NAMES geosd
|
71 |
+
+ PATHS
|
72 |
+
+ ${GEOS_DIR}/lib
|
73 |
+
+ $ENV{GEOS_DIR}
|
74 |
+
+ NO_DEFAULT_PATH
|
75 |
+
+ PATH_SUFFIXES lib64 lib
|
76 |
+
+ )
|
77 |
+
+
|
78 |
+
+ set(GEOS_LIBRARY "${GEOS_LIBRARY};${GEOS_CXX_LIBRARY}" CACHE STRING "Geos Libraries" FORCE )
|
79 |
+
+ set(GEOS_LIBRARY_DEBUG "${GEOS_LIBRARY_DEBUG};${GEOS_CXX_LIBRARY_DEBUG}" CACHE STRING "Geos Debug Libraries" FORCE )
|
80 |
+
+
|
81 |
+
+ENDIF(GEOS_IS_STATIC)
|
82 |
+
--
|
83 |
+
2.29.2
|
84 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/blend2d-fix.patch
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp
|
2 |
+
index 84007aee9..de8e511df 100644
|
3 |
+
--- a/src/osgEarth/FeatureRasterizer.cpp
|
4 |
+
+++ b/src/osgEarth/FeatureRasterizer.cpp
|
5 |
+
@@ -245,8 +245,8 @@ namespace osgEarth {
|
6 |
+
});
|
7 |
+
|
8 |
+
Color color(Color::White);
|
9 |
+
- uint32_t cap = BL_STROKE_CAP_ROUND;
|
10 |
+
- uint32_t join = BL_STROKE_JOIN_ROUND;
|
11 |
+
+ auto cap = BL_STROKE_CAP_ROUND;
|
12 |
+
+ auto join = BL_STROKE_JOIN_ROUND;
|
13 |
+
|
14 |
+
if (symbol->stroke().isSet())
|
15 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-dependency-osg.patch
ADDED
@@ -0,0 +1,176 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/FindOSG.cmake b/CMakeModules/FindOSG.cmake
|
2 |
+
index b7dff11..d1ec2ff 100644
|
3 |
+
--- a/CMakeModules/FindOSG.cmake
|
4 |
+
+++ b/CMakeModules/FindOSG.cmake
|
5 |
+
@@ -121,5 +121,40 @@ IF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
|
6 |
+
SET( OSG_FOUND "YES" )
|
7 |
+
SET( OSG_INCLUDE_DIRS ${OSG_INCLUDE_DIR} ${OSG_GEN_INCLUDE_DIR} )
|
8 |
+
GET_FILENAME_COMPONENT( OSG_LIBRARIES_DIR ${OSG_LIBRARY} PATH )
|
9 |
+
+
|
10 |
+
+ find_package(ZLIB REQUIRED)
|
11 |
+
+ set(ZLIB_LIBRARY ZLIB::ZLIB)
|
12 |
+
+
|
13 |
+
+ find_package(Freetype REQUIRED)
|
14 |
+
+ set(FREETYPE_LIBRARY Freetype::Freetype)
|
15 |
+
+
|
16 |
+
+ find_package(unofficial-brotli CONFIG REQUIRED)
|
17 |
+
+ find_package(BZip2 REQUIRED)
|
18 |
+
+ find_package(expat CONFIG REQUIRED)
|
19 |
+
+ find_package(PNG REQUIRED)
|
20 |
+
+ find_package(JPEG REQUIRED)
|
21 |
+
+ find_package(TIFF REQUIRED)
|
22 |
+
+ find_package(zstd REQUIRED)
|
23 |
+
+ find_package(GIF REQUIRED)
|
24 |
+
+ if (WIN32)
|
25 |
+
+ find_package(pthreads CONFIG REQUIRED)
|
26 |
+
+ list(APPEND OSG_DEPENDS_LIBRARY PThreads4W::PThreads4W)
|
27 |
+
+ endif()
|
28 |
+
+
|
29 |
+
+ if (UNIX)
|
30 |
+
+ list(APPEND OSG_DEPENDS_LIBRARY ${OSG_DEPENDS_LIBRARY} -pthread)
|
31 |
+
+ # Due to Linux Linker dependency issues these need to included again
|
32 |
+
+ set(DEPEND_LIB_LIST fontconfig freetype uuid gdal json-c expat zstd proj sqlite3 webp gif cfitsio openjp2 xml2)
|
33 |
+
+ else(UNIX)
|
34 |
+
+ set(DEPEND_LIB_LIST cfitsio)
|
35 |
+
+ endif()
|
36 |
+
+ foreach (libname ${DEPEND_LIB_LIST})
|
37 |
+
+ find_library(${libname}_LIBRARY_RELEASE NAMES ${libname} NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
|
38 |
+
+ find_library(${libname}_LIBRARY_DEBUG NAMES ${libname} ${libname}d ${libname}_d NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
|
39 |
+
+ select_library_configurations(${libname})
|
40 |
+
+ list(APPEND OSG_DEPENDS_LIBRARY ${${libname}_LIBRARY})
|
41 |
+
+ endforeach()
|
42 |
+
+ list(APPEND OSG_DEPENDS_LIBRARY ZLIB::ZLIB Freetype::Freetype expat::expat PNG::PNG JPEG::JPEG TIFF::TIFF ${GIF_LIBRARIES} ${CFITSIO_LIBRARY})
|
43 |
+
+
|
44 |
+
ENDIF( OSG_LIBRARY AND OSG_INCLUDE_DIR )
|
45 |
+
|
46 |
+
diff --git a/src/applications/osgearth_3pv/CMakeLists.txt b/src/applications/osgearth_3pv/CMakeLists.txt
|
47 |
+
index e1dc876..6d688ff 100644
|
48 |
+
--- a/src/applications/osgearth_3pv/CMakeLists.txt
|
49 |
+
+++ b/src/applications/osgearth_3pv/CMakeLists.txt
|
50 |
+
@@ -1,5 +1,5 @@
|
51 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
52 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
53 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
54 |
+
|
55 |
+
SET(TARGET_SRC osgearth_3pv.cpp )
|
56 |
+
|
57 |
+
diff --git a/src/applications/osgearth_atlas/CMakeLists.txt b/src/applications/osgearth_atlas/CMakeLists.txt
|
58 |
+
index aadbb5e..69698c7 100644
|
59 |
+
--- a/src/applications/osgearth_atlas/CMakeLists.txt
|
60 |
+
+++ b/src/applications/osgearth_atlas/CMakeLists.txt
|
61 |
+
@@ -1,6 +1,6 @@
|
62 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
63 |
+
|
64 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
65 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
66 |
+
|
67 |
+
SET(TARGET_SRC osgearth_atlas.cpp )
|
68 |
+
|
69 |
+
diff --git a/src/applications/osgearth_boundarygen/CMakeLists.txt b/src/applications/osgearth_boundarygen/CMakeLists.txt
|
70 |
+
index fe9ec6b..52915b0 100644
|
71 |
+
--- a/src/applications/osgearth_boundarygen/CMakeLists.txt
|
72 |
+
+++ b/src/applications/osgearth_boundarygen/CMakeLists.txt
|
73 |
+
@@ -1,5 +1,5 @@
|
74 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
75 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
76 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
77 |
+
|
78 |
+
SET(TARGET_H
|
79 |
+
BoundaryUtil
|
80 |
+
diff --git a/src/applications/osgearth_clamp/CMakeLists.txt b/src/applications/osgearth_clamp/CMakeLists.txt
|
81 |
+
index 996ea43..728ee77 100644
|
82 |
+
--- a/src/applications/osgearth_clamp/CMakeLists.txt
|
83 |
+
+++ b/src/applications/osgearth_clamp/CMakeLists.txt
|
84 |
+
@@ -1,5 +1,5 @@
|
85 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
86 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
|
87 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
88 |
+
|
89 |
+
SET(TARGET_SRC osgearth_clamp.cpp)
|
90 |
+
|
91 |
+
diff --git a/src/applications/osgearth_conv/CMakeLists.txt b/src/applications/osgearth_conv/CMakeLists.txt
|
92 |
+
index a77d703..2aac5f2 100644
|
93 |
+
--- a/src/applications/osgearth_conv/CMakeLists.txt
|
94 |
+
+++ b/src/applications/osgearth_conv/CMakeLists.txt
|
95 |
+
@@ -1,5 +1,5 @@
|
96 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
97 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OPENTHREADS_LIBRARY)
|
98 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
99 |
+
|
100 |
+
SET(TARGET_SRC osgearth_conv.cpp )
|
101 |
+
|
102 |
+
diff --git a/src/applications/osgearth_overlayviewer/CMakeLists.txt b/src/applications/osgearth_overlayviewer/CMakeLists.txt
|
103 |
+
index bb2802a..5175cfc 100644
|
104 |
+
--- a/src/applications/osgearth_overlayviewer/CMakeLists.txt
|
105 |
+
+++ b/src/applications/osgearth_overlayviewer/CMakeLists.txt
|
106 |
+
@@ -1,5 +1,5 @@
|
107 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
108 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
109 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
110 |
+
|
111 |
+
SET(TARGET_SRC osgearth_overlayviewer.cpp )
|
112 |
+
|
113 |
+
diff --git a/src/applications/osgearth_tfs/CMakeLists.txt b/src/applications/osgearth_tfs/CMakeLists.txt
|
114 |
+
index 90c153a..d331019 100644
|
115 |
+
--- a/src/applications/osgearth_tfs/CMakeLists.txt
|
116 |
+
+++ b/src/applications/osgearth_tfs/CMakeLists.txt
|
117 |
+
@@ -1,6 +1,6 @@
|
118 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
119 |
+
|
120 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
121 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
122 |
+
|
123 |
+
SET(TARGET_SRC osgearth_tfs.cpp )
|
124 |
+
|
125 |
+
diff --git a/src/applications/osgearth_toc/CMakeLists.txt b/src/applications/osgearth_toc/CMakeLists.txt
|
126 |
+
index b32c523..7b25b79 100644
|
127 |
+
--- a/src/applications/osgearth_toc/CMakeLists.txt
|
128 |
+
+++ b/src/applications/osgearth_toc/CMakeLists.txt
|
129 |
+
@@ -1,5 +1,5 @@
|
130 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
131 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY OSGWIDGET_LIBRARY)
|
132 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGWIDGET_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
133 |
+
|
134 |
+
SET(TARGET_SRC osgearth_toc.cpp )
|
135 |
+
|
136 |
+
diff --git a/src/applications/osgearth_version/CMakeLists.txt b/src/applications/osgearth_version/CMakeLists.txt
|
137 |
+
index 1f1d48d..01e963b 100644
|
138 |
+
--- a/src/applications/osgearth_version/CMakeLists.txt
|
139 |
+
+++ b/src/applications/osgearth_version/CMakeLists.txt
|
140 |
+
@@ -1,5 +1,5 @@
|
141 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
142 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
143 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
144 |
+
|
145 |
+
SET(TARGET_SRC osgearth_version.cpp )
|
146 |
+
|
147 |
+
diff --git a/src/applications/osgearth_viewer/CMakeLists.txt b/src/applications/osgearth_viewer/CMakeLists.txt
|
148 |
+
index 8c61e42..bbda7be 100644
|
149 |
+
--- a/src/applications/osgearth_viewer/CMakeLists.txt
|
150 |
+
+++ b/src/applications/osgearth_viewer/CMakeLists.txt
|
151 |
+
@@ -1,5 +1,5 @@
|
152 |
+
INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
|
153 |
+
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
154 |
+
+SET(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OPENTHREADS_LIBRARY)
|
155 |
+
|
156 |
+
SET(TARGET_SRC osgearth_viewer.cpp )
|
157 |
+
|
158 |
+
diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
|
159 |
+
index cd55c1164..7cecdac74 100644
|
160 |
+
--- a/src/osgEarth/CMakeLists.txt
|
161 |
+
+++ b/src/osgEarth/CMakeLists.txt
|
162 |
+
@@ -928,9 +928,11 @@ ENDIF(TRACY_FOUND)
|
163 |
+
|
164 |
+
OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
|
165 |
+
if(NOT NRL_STATIC_LIBRARIES)
|
166 |
+
- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)
|
167 |
+
+ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
|
168 |
+
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES})
|
169 |
+
else(NOT NRL_STATIC_LIBRARIES)
|
170 |
+
- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
|
171 |
+
+ LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY)
|
172 |
+
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY})
|
173 |
+
endif(NOT NRL_STATIC_LIBRARIES)
|
174 |
+
|
175 |
+
LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})
|
176 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-gcc11-compilation.patch
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001
|
2 |
+
From: Ankur Verma <[email protected]>
|
3 |
+
Date: Wed, 28 Jul 2021 06:40:45 -0700
|
4 |
+
Subject: [PATCH] fix-gcc11-compilation
|
5 |
+
|
6 |
+
---
|
7 |
+
src/osgEarth/Units | 8 ++++----
|
8 |
+
1 file changed, 4 insertions(+), 4 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/src/osgEarth/Units b/src/osgEarth/Units
|
11 |
+
index dd19afe..bfe826a 100644
|
12 |
+
--- a/src/osgEarth/Units
|
13 |
+
+++ b/src/osgEarth/Units
|
14 |
+
@@ -196,17 +196,17 @@ namespace osgEarth
|
15 |
+
class qualified_double
|
16 |
+
{
|
17 |
+
public:
|
18 |
+
- qualified_double<T>( double value, const Units& units ) : _value(value), _units(units) { }
|
19 |
+
+ qualified_double( double value, const Units& units ) : _value(value), _units(units) { }
|
20 |
+
|
21 |
+
- qualified_double<T>( const T& rhs ) : _value(rhs._value), _units(rhs._units) { }
|
22 |
+
+ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { }
|
23 |
+
|
24 |
+
// parses the qualified number from a parseable string (e.g., "123km")
|
25 |
+
- qualified_double<T>(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) {
|
26 |
+
+ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) {
|
27 |
+
Units::parse( parseable, _value, _units, defaultUnits );
|
28 |
+
}
|
29 |
+
|
30 |
+
// loads the qualified number from an old-school config (e.g., { value="123" units="km" } )
|
31 |
+
- qualified_double<T>( const Config& conf, const Units& defaultUnits ) : _value(0.0) {
|
32 |
+
+ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) {
|
33 |
+
if ( conf.hasValue("value") ) {
|
34 |
+
_value = conf.value<double>("value", 0.0);
|
35 |
+
if ( !Units::parse( conf.value("units"), _units ) )
|
36 |
+
--
|
37 |
+
2.31.1
|
38 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/fix-imgui.patch
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 2aa1535341c9aace4a5ca0115fa51dbf76f582ec Mon Sep 17 00:00:00 2001
|
2 |
+
From: Ankur Verma <[email protected]>
|
3 |
+
Date: Wed, 29 Sep 2021 23:12:52 -0700
|
4 |
+
Subject: [PATCH] patch
|
5 |
+
|
6 |
+
---
|
7 |
+
src/applications/osgearth_imgui/CMakeLists.txt | 2 +-
|
8 |
+
1 file changed, 1 insertion(+), 1 deletion(-)
|
9 |
+
|
10 |
+
diff --git a/src/applications/osgearth_imgui/CMakeLists.txt b/src/applications/osgearth_imgui/CMakeLists.txt
|
11 |
+
index 246fd89..5ea6f63 100644
|
12 |
+
--- a/src/applications/osgearth_imgui/CMakeLists.txt
|
13 |
+
+++ b/src/applications/osgearth_imgui/CMakeLists.txt
|
14 |
+
@@ -1,3 +1,3 @@
|
15 |
+
-set(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
16 |
+
+set(TARGET_LIBRARIES_VARS OSGDB_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
|
17 |
+
set(TARGET_SRC osgearth_imgui.cpp)
|
18 |
+
SETUP_IMGUI_APPLICATION(osgearth_imgui)
|
19 |
+
--
|
20 |
+
2.31.1
|
21 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/make-all-find-packages-required.patch
ADDED
@@ -0,0 +1,115 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 7541c8d07..cc14d2160 100755
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit
|
6 |
+
|
7 |
+
# Mobile/GLES:
|
8 |
+
IF (OSGEARTH_USE_GLES)
|
9 |
+
- find_package(OpenGLES)
|
10 |
+
+ find_package(OpenGLES REQUIRED)
|
11 |
+
ELSE ()
|
12 |
+
- find_package(OpenGL)
|
13 |
+
+ find_package(OpenGL REQUIRED)
|
14 |
+
ENDIF (OSGEARTH_USE_GLES)
|
15 |
+
|
16 |
+
# required
|
17 |
+
find_package(OSG REQUIRED)
|
18 |
+
-find_package(CURL REQUIRED)
|
19 |
+
+find_package(CURL CONFIG REQUIRED)
|
20 |
+
+set(CURL_LIBRARY CURL::libcurl)
|
21 |
+
find_package(GDAL REQUIRED)
|
22 |
+
-
|
23 |
+
+set(GDAL_LIBRARY ${GDAL_LIBRARIES})
|
24 |
+
+set(GDAL_FOUND 1)
|
25 |
+
# optional
|
26 |
+
-find_package(GEOS)
|
27 |
+
-find_package(Sqlite3)
|
28 |
+
-find_package(Draco)
|
29 |
+
-find_package(BASISU)
|
30 |
+
-find_package(GLEW)
|
31 |
+
-find_package(Protobuf)
|
32 |
+
-find_package(WEBP)
|
33 |
+
-find_package(Blend2D)
|
34 |
+
+find_package(geos CONFIG REQUIRED)
|
35 |
+
+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c)
|
36 |
+
+set(GEOS_FOUND 1)
|
37 |
+
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
|
38 |
+
+set(SQLITE3_FOUND 1)
|
39 |
+
+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3)
|
40 |
+
+find_package(Draco REQUIRED)
|
41 |
+
+find_package(BASISU REQUIRED)
|
42 |
+
+find_package(GLEW REQUIRED)
|
43 |
+
+set(GLEW_LIBRARIES GLEW::GLEW)
|
44 |
+
+set(GLEW_FOUND 1)
|
45 |
+
+find_package(protobuf CONFIG REQUIRED)
|
46 |
+
+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf)
|
47 |
+
+set(Protobuf_FOUND 1)
|
48 |
+
+find_package(WebP CONFIG REQUIRED)
|
49 |
+
+set(WEBP_LIBRARY WebP::webp)
|
50 |
+
+set(WEBP_FOUND 1)
|
51 |
+
+find_package(Blend2D CONFIG REQUIRED)
|
52 |
+
|
53 |
+
if(OSGEARTH_ENABLE_PROFILING)
|
54 |
+
- find_package(Tracy)
|
55 |
+
+ find_package(Tracy REQUIRED)
|
56 |
+
endif()
|
57 |
+
|
58 |
+
if(OSGEARTH_BUILD_ZIP_PLUGIN)
|
59 |
+
- find_package(LIBZIP)
|
60 |
+
+ find_package(libzip CONFIG REQUIRED)
|
61 |
+
+ set(LIBZIP_LIBRARY libzip::zip)
|
62 |
+
+ set(LIBZIP_FOUND 1)
|
63 |
+
endif()
|
64 |
+
|
65 |
+
if(OSGEARTH_BUILD_TRITON_NODEKIT)
|
66 |
+
- find_package(Triton QUIET)
|
67 |
+
+ find_package(Triton QUIET REQUIRED)
|
68 |
+
endif()
|
69 |
+
|
70 |
+
if(OSGEARTH_BUILD_SILVERLINING_NODEKIT)
|
71 |
+
- find_package(SilverLining QUIET)
|
72 |
+
+ find_package(SilverLining QUIET REQUIRED)
|
73 |
+
endif()
|
74 |
+
|
75 |
+
# Sqlite enables the MBTiles format:
|
76 |
+
@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile
|
77 |
+
# Duktape is the JavaScript interpreter
|
78 |
+
SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
|
79 |
+
IF (WITH_EXTERNAL_DUKTAPE)
|
80 |
+
- find_package(Duktape)
|
81 |
+
+ find_package(Duktape REQUIRED)
|
82 |
+
ENDIF (WITH_EXTERNAL_DUKTAPE)
|
83 |
+
|
84 |
+
# Whether to install shaders (glsl files).
|
85 |
+
@@ -204,7 +218,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak
|
86 |
+
# TinyXML is an XML parsing library
|
87 |
+
SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML")
|
88 |
+
IF (WITH_EXTERNAL_TINYXML)
|
89 |
+
- find_package(TinyXML)
|
90 |
+
+ find_package(tinyxml CONFIG REQUIRED)
|
91 |
+
+ set(TINYXML_FOUND 1)
|
92 |
+
+ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml)
|
93 |
+
ENDIF (WITH_EXTERNAL_TINYXML)
|
94 |
+
|
95 |
+
# postfix settings for various configs
|
96 |
+
diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
|
97 |
+
index cd55c1164..4ecb61f0d 100644
|
98 |
+
--- a/src/osgEarth/CMakeLists.txt
|
99 |
+
+++ b/src/osgEarth/CMakeLists.txt
|
100 |
+
@@ -909,11 +909,11 @@ IF(FILEGDB_FOUND)
|
101 |
+
LINK_WITH_VARIABLES(${LIB_NAME} FILEGDB_LIBRARY)
|
102 |
+
ENDIF()
|
103 |
+
|
104 |
+
-IF(BLEND2D_FOUND)
|
105 |
+
+#IF(BLEND2D_FOUND)
|
106 |
+
add_definitions(-DOSGEARTH_HAVE_BLEND2D)
|
107 |
+
- include_directories(${BLEND2D_INCLUDES})
|
108 |
+
- link_with_variables(${LIB_NAME} BLEND2D_LIBRARY)
|
109 |
+
-ENDIF()
|
110 |
+
+# include_directories(${BLEND2D_INCLUDES})
|
111 |
+
+ target_link_libraries(${LIB_NAME} blend2d::blend2d)
|
112 |
+
+#ENDIF()
|
113 |
+
|
114 |
+
IF (WIN32)
|
115 |
+
LINK_EXTERNAL(${LIB_NAME} ${TARGET_EXTERNAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} )
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/portfile.cmake
ADDED
@@ -0,0 +1,90 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Only dynamic build need dlls
|
2 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
3 |
+
file(GLOB OSG_PLUGINS_SUBDIR "${CURRENT_INSTALLED_DIR}/tools/osg/osgPlugins-*")
|
4 |
+
list(LENGTH OSG_PLUGINS_SUBDIR OSG_PLUGINS_SUBDIR_LENGTH)
|
5 |
+
if(NOT OSG_PLUGINS_SUBDIR_LENGTH EQUAL 1)
|
6 |
+
message(FATAL_ERROR "Could not determine osg version")
|
7 |
+
endif()
|
8 |
+
string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/osg/" "" OSG_PLUGINS_SUBDIR "${OSG_PLUGINS_SUBDIR}")
|
9 |
+
endif()
|
10 |
+
|
11 |
+
vcpkg_from_github(
|
12 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
13 |
+
REPO gwaldron/osgearth
|
14 |
+
REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2
|
15 |
+
SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670
|
16 |
+
HEAD_REF master
|
17 |
+
PATCHES
|
18 |
+
StaticOSG.patch # Fix port compilation in static-md module
|
19 |
+
make-all-find-packages-required.patch
|
20 |
+
fix-dependency-osg.patch
|
21 |
+
remove-tool-debug-suffix.patch
|
22 |
+
fix-imgui.patch
|
23 |
+
fix-gcc11-compilation.patch
|
24 |
+
blend2d-fix.patch
|
25 |
+
)
|
26 |
+
|
27 |
+
# Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002
|
28 |
+
file(REMOVE "${SOURCE_PATH}/src/osgEarth/tinyxml.h")
|
29 |
+
|
30 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
31 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
|
32 |
+
|
33 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
34 |
+
tools OSGEARTH_BUILD_TOOLS
|
35 |
+
)
|
36 |
+
|
37 |
+
vcpkg_cmake_configure(
|
38 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
39 |
+
OPTIONS ${FEATURE_OPTIONS}
|
40 |
+
-DOSGEARTH_BUILD_SHARED_LIBS=${BUILD_SHARED}
|
41 |
+
-DNRL_STATIC_LIBRARIES=${BUILD_STATIC}
|
42 |
+
-DOSG_IS_STATIC=${BUILD_STATIC}
|
43 |
+
-DGEOS_IS_STATIC=${BUILD_STATIC}
|
44 |
+
-DCURL_IS_STATIC=${BUILD_STATIC}
|
45 |
+
-DOSGEARTH_BUILD_EXAMPLES=OFF
|
46 |
+
-DOSGEARTH_BUILD_TESTS=OFF
|
47 |
+
-DOSGEARTH_BUILD_DOCS=OFF
|
48 |
+
-DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF
|
49 |
+
-DOSGEARTH_BUILD_TRITON_NODEKIT=OFF
|
50 |
+
-DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF
|
51 |
+
-DWITH_EXTERNAL_TINYXML=ON
|
52 |
+
)
|
53 |
+
|
54 |
+
vcpkg_cmake_install()
|
55 |
+
|
56 |
+
if (WIN32 AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic"))
|
57 |
+
#Release
|
58 |
+
set(OSGEARTH_TOOL_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
59 |
+
set(OSGEARTH_TOOL_PLUGIN_PATH "${OSGEARTH_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}")
|
60 |
+
|
61 |
+
file(MAKE_DIRECTORY "${OSGEARTH_TOOL_PLUGIN_PATH}")
|
62 |
+
file(GLOB OSGDB_PLUGINS "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll")
|
63 |
+
|
64 |
+
file(COPY ${OSGDB_PLUGINS} DESTINATION "${OSGEARTH_TOOL_PLUGIN_PATH}")
|
65 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${OSG_PLUGINS_SUBDIR}")
|
66 |
+
|
67 |
+
#Debug
|
68 |
+
set(OSGEARTH_DEBUG_TOOL_PATH "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}")
|
69 |
+
set(OSGEARTH_DEBUG_TOOL_PLUGIN_PATH "${OSGEARTH_DEBUG_TOOL_PATH}/${OSG_PLUGINS_SUBDIR}")
|
70 |
+
|
71 |
+
file(MAKE_DIRECTORY "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}")
|
72 |
+
|
73 |
+
file(GLOB OSGDB_DEBUG_PLUGINS "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}/osgdb*.dll")
|
74 |
+
|
75 |
+
file(COPY ${OSGDB_DEBUG_PLUGINS} DESTINATION "${OSGEARTH_DEBUG_TOOL_PLUGIN_PATH}")
|
76 |
+
|
77 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/${OSG_PLUGINS_SUBDIR}")
|
78 |
+
endif()
|
79 |
+
|
80 |
+
if ("tools" IN_LIST FEATURES)
|
81 |
+
vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp
|
82 |
+
osgearth_conv osgearth_imgui osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer
|
83 |
+
AUTO_CLEAN
|
84 |
+
)
|
85 |
+
endif()
|
86 |
+
|
87 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
88 |
+
|
89 |
+
# Handle copyright
|
90 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/remove-tool-debug-suffix.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake
|
2 |
+
index 6e0eb46..12388c4 100644
|
3 |
+
--- a/CMakeModules/OsgEarthMacroUtils.cmake
|
4 |
+
+++ b/CMakeModules/OsgEarthMacroUtils.cmake
|
5 |
+
@@ -364,8 +364,6 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
|
6 |
+
|
7 |
+
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
|
8 |
+
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
|
9 |
+
- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_OUTPUT_NAME "${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}")
|
10 |
+
- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELEASE_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELEASE_POSTFIX}")
|
11 |
+
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}")
|
12 |
+
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}")
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osgearth/vcpkg.json
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "osgearth",
|
3 |
+
"version": "3.2",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
|
6 |
+
"homepage": "https://github.com/gwaldron/osgearth",
|
7 |
+
"supports": "!(x86 | wasm32)",
|
8 |
+
"dependencies": [
|
9 |
+
"basisu",
|
10 |
+
"blend2d",
|
11 |
+
"cfitsio",
|
12 |
+
"draco",
|
13 |
+
"geos",
|
14 |
+
"glew",
|
15 |
+
"libwebp",
|
16 |
+
"libzip",
|
17 |
+
"opengl",
|
18 |
+
{
|
19 |
+
"name": "osg",
|
20 |
+
"features": [
|
21 |
+
"plugins"
|
22 |
+
]
|
23 |
+
},
|
24 |
+
"protobuf",
|
25 |
+
"pthreads",
|
26 |
+
"sqlite3",
|
27 |
+
"tinyxml",
|
28 |
+
{
|
29 |
+
"name": "vcpkg-cmake",
|
30 |
+
"host": true
|
31 |
+
}
|
32 |
+
],
|
33 |
+
"default-features": [
|
34 |
+
"tools"
|
35 |
+
],
|
36 |
+
"features": {
|
37 |
+
"tools": {
|
38 |
+
"description": "Build tools"
|
39 |
+
}
|
40 |
+
}
|
41 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/CMakeLists.txt
ADDED
@@ -0,0 +1,89 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.11)
|
2 |
+
|
3 |
+
project(Osi LANGUAGES C CXX)
|
4 |
+
|
5 |
+
set(PROJECT_VERSION 0.107.9)
|
6 |
+
set(PROJECT_VERSION_MAJOR 0)
|
7 |
+
set(PROJECT_VERSION_MINOR 107)
|
8 |
+
set(PROJECT_VERSION_PATCH 9)
|
9 |
+
|
10 |
+
set(CMAKE_CXX_STANDARD 14)
|
11 |
+
|
12 |
+
set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed")
|
13 |
+
set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed")
|
14 |
+
set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed")
|
15 |
+
set(INSTALL_CMAKE_DIR "share/osi" CACHE PATH "Path where cmake configs will be installed")
|
16 |
+
|
17 |
+
# Make relative paths absolute (needed later on)
|
18 |
+
set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR})
|
19 |
+
foreach(p LIB BIN INCLUDE CMAKE)
|
20 |
+
set(var INSTALL_${p}_DIR)
|
21 |
+
if(NOT IS_ABSOLUTE "${${var}}")
|
22 |
+
set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
|
23 |
+
endif()
|
24 |
+
endforeach()
|
25 |
+
|
26 |
+
if(MSVC)
|
27 |
+
set(
|
28 |
+
CMAKE_CXX_FLAGS
|
29 |
+
"${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275"
|
30 |
+
)
|
31 |
+
endif()
|
32 |
+
|
33 |
+
if(APPLE)
|
34 |
+
set(
|
35 |
+
CMAKE_CXX_FLAGS
|
36 |
+
"${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions"
|
37 |
+
)
|
38 |
+
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
|
39 |
+
CACHE STRING "Minimum OS X deployment version")
|
40 |
+
endif()
|
41 |
+
|
42 |
+
find_package(CoinUtils REQUIRED)
|
43 |
+
|
44 |
+
file(GLOB OSI_SOURCES Osi/src/Osi/*.hpp Osi/src/Osi/*.cpp)
|
45 |
+
|
46 |
+
add_library(${PROJECT_NAME} ${OSI_SOURCES})
|
47 |
+
|
48 |
+
target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:${RELATIVE_INSTALL_INCLUDE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Osi/src/Osi>)
|
49 |
+
|
50 |
+
if(MSVC)
|
51 |
+
target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
|
52 |
+
endif()
|
53 |
+
target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH)
|
54 |
+
|
55 |
+
target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils)
|
56 |
+
|
57 |
+
install(DIRECTORY Osi/src/Osi/
|
58 |
+
DESTINATION ${INSTALL_INCLUDE_DIR}
|
59 |
+
FILES_MATCHING
|
60 |
+
PATTERN "*.h"
|
61 |
+
PATTERN "*.hpp"
|
62 |
+
PATTERN "config_default.h" EXCLUDE)
|
63 |
+
|
64 |
+
install(TARGETS ${PROJECT_NAME}
|
65 |
+
EXPORT "${PROJECT_NAME}Targets"
|
66 |
+
LIBRARY DESTINATION lib
|
67 |
+
ARCHIVE DESTINATION lib
|
68 |
+
RUNTIME DESTINATION bin)
|
69 |
+
|
70 |
+
include(CMakePackageConfigHelpers)
|
71 |
+
|
72 |
+
set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake")
|
73 |
+
set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake")
|
74 |
+
set(namespace "Coin::")
|
75 |
+
|
76 |
+
write_basic_package_version_file("${version_config}"
|
77 |
+
COMPATIBILITY SameMajorVersion)
|
78 |
+
|
79 |
+
configure_package_config_file("Config.cmake.in"
|
80 |
+
"${project_config}"
|
81 |
+
INSTALL_DESTINATION
|
82 |
+
"${INSTALL_CMAKE_DIR}")
|
83 |
+
|
84 |
+
install(FILES "${project_config}" "${version_config}"
|
85 |
+
DESTINATION "${INSTALL_CMAKE_DIR}")
|
86 |
+
|
87 |
+
install(EXPORT "${PROJECT_NAME}Targets"
|
88 |
+
NAMESPACE "${namespace}"
|
89 |
+
DESTINATION "${INSTALL_CMAKE_DIR}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/Config.cmake.in
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
@PACKAGE_INIT@
|
3 |
+
|
4 |
+
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
|
5 |
+
check_required_components("@PROJECT_NAME@")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/portfile.cmake
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO coin-or/Osi
|
6 |
+
REF dfa6449d6756fdd96912cf96e168d0be07b1d37c # releases/0.108.6
|
7 |
+
SHA512 8c23998a3f442766c515acd5549ed97608b972de61b9ef5b50b9e5d1d03b43fb5f77dc02d3562084fbf4f18f3397f9cd50c0f9bde4f576a4dff0dab795c04358
|
8 |
+
)
|
9 |
+
|
10 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
11 |
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH})
|
12 |
+
|
13 |
+
vcpkg_configure_cmake(
|
14 |
+
SOURCE_PATH ${SOURCE_PATH}
|
15 |
+
PREFER_NINJA
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_install_cmake()
|
19 |
+
vcpkg_copy_pdbs()
|
20 |
+
vcpkg_fixup_cmake_targets()
|
21 |
+
|
22 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
23 |
+
|
24 |
+
# Handle copyright
|
25 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/osi/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "osi",
|
3 |
+
"version-string": "0.108.6",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.",
|
6 |
+
"dependencies": [
|
7 |
+
"coinutils"
|
8 |
+
]
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/otl/portfile.cmake
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(OTL_VERSION 40463)
|
2 |
+
|
3 |
+
vcpkg_download_distfile(ARCHIVE
|
4 |
+
URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip"
|
5 |
+
FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip"
|
6 |
+
SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_extract_source_archive_ex(
|
10 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
11 |
+
ARCHIVE ${ARCHIVE}
|
12 |
+
NO_REMOVE_ONE_LEVEL
|
13 |
+
)
|
14 |
+
|
15 |
+
file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h"
|
16 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}"
|
17 |
+
RENAME otlv4.h)
|
18 |
+
|
19 |
+
file(READ "${SOURCE_PATH}/otlv${OTL_VERSION}.h" copyright_contents)
|
20 |
+
string(FIND "${copyright_contents}" "#ifndef OTL_H" start_of_source)
|
21 |
+
if(start_of_source EQUAL "-1")
|
22 |
+
message(FATAL_ERROR "Could not find start of source; the header file has changed in a way that we cannot get the license text.")
|
23 |
+
endif()
|
24 |
+
string(SUBSTRING "${copyright_contents}" 0 "${start_of_source}" copyright_contents)
|
25 |
+
string(REGEX REPLACE "// ?" "" copyright_contents "${copyright_contents}")
|
26 |
+
string(REGEX REPLACE "=+\n" "" copyright_contents "${copyright_contents}")
|
27 |
+
|
28 |
+
file(WRITE
|
29 |
+
"${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright"
|
30 |
+
"${copyright_contents}"
|
31 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/otl/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "otl",
|
3 |
+
"version": "4.0.463",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Oracle, Odbc and DB2-CLI Template Library",
|
6 |
+
"homepage": "http://otl.sourceforge.net/",
|
7 |
+
"license": "ISC"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/outcome-prune-sources.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git "a/cmake/headers.cmake" "b/cmake/headers.cmake"
|
2 |
+
index 108038d16..bf4807e16 100644
|
3 |
+
--- "a/cmake/headers.cmake"
|
4 |
+
+++ "b/cmake/headers.cmake"
|
5 |
+
@@ -47,7 +47,6 @@ set(outcome_HEADERS
|
6 |
+
"include/outcome/experimental/status-code/include/system_code_from_exception.hpp"
|
7 |
+
"include/outcome/experimental/status-code/include/system_error2.hpp"
|
8 |
+
"include/outcome/experimental/status-code/include/win32_code.hpp"
|
9 |
+
- "include/outcome/experimental/status-code/single-header/system_error2.hpp"
|
10 |
+
"include/outcome/experimental/status_outcome.hpp"
|
11 |
+
"include/outcome/experimental/status_result.hpp"
|
12 |
+
"include/outcome/iostream_support.hpp"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/portfile.cmake
ADDED
@@ -0,0 +1,77 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Outcome is composed of other third party libraries:
|
2 |
+
# Outcome
|
3 |
+
# <= status-code
|
4 |
+
# <= quickcpplib
|
5 |
+
# <= byte-lite
|
6 |
+
# <= gsl-lite
|
7 |
+
# <= Optional
|
8 |
+
#
|
9 |
+
# byte-lite and gsl-lite are in vcpkg, but may not be versions
|
10 |
+
# known to be compatible with Outcome. It has occurred in the
|
11 |
+
# past that newer versions were severely broken with Outcome.
|
12 |
+
#
|
13 |
+
# One can fetch an 'all sources' tarball from
|
14 |
+
# https://github.com/ned14/outcome/releases which contains
|
15 |
+
# the exact copy of those third party libraries known to
|
16 |
+
# have passed Outcome's CI process.
|
17 |
+
|
18 |
+
message(WARNING [=[
|
19 |
+
Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against.
|
20 |
+
]=])
|
21 |
+
|
22 |
+
vcpkg_from_github(
|
23 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
24 |
+
REPO ned14/outcome
|
25 |
+
REF 9c6ad6e8e6a48ddde65c0617e3df306bc901b41d
|
26 |
+
SHA512 b53807fdf9ac3647882f2029a7c5311e7f313abaec703142d2c6d4e73651898d868bfdd600e5f2fa3344e91ebb576324b4624ccf4aa8e09314b7a7ede4cb0fbc
|
27 |
+
HEAD_REF develop
|
28 |
+
PATCHES
|
29 |
+
outcome-prune-sources.patch
|
30 |
+
)
|
31 |
+
|
32 |
+
# Outcome needs a copy of QuickCppLib with which to bootstrap its cmake
|
33 |
+
file(COPY "${CURRENT_INSTALLED_DIR}/include/quickcpplib"
|
34 |
+
DESTINATION "${SOURCE_PATH}/quickcpplib/repo/include/"
|
35 |
+
)
|
36 |
+
file(COPY "${CURRENT_INSTALLED_DIR}/share/ned14-internal-quickcpplib/"
|
37 |
+
DESTINATION "${SOURCE_PATH}/quickcpplib/repo/"
|
38 |
+
)
|
39 |
+
|
40 |
+
# Outcome expects status-code to live inside its include directory
|
41 |
+
file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/"
|
42 |
+
DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/"
|
43 |
+
)
|
44 |
+
file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/detail/"
|
45 |
+
DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/detail/"
|
46 |
+
)
|
47 |
+
|
48 |
+
# Because outcome's deployed files are header-only, the debug build is not necessary
|
49 |
+
set(VCPKG_BUILD_TYPE release)
|
50 |
+
|
51 |
+
# Already installed dependencies don't appear on the include path, which Outcome assumes.
|
52 |
+
string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"")
|
53 |
+
string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"")
|
54 |
+
|
55 |
+
# Use Outcome's own build process, skipping examples and tests.
|
56 |
+
vcpkg_configure_cmake(
|
57 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
58 |
+
PREFER_NINJA
|
59 |
+
OPTIONS
|
60 |
+
-DPROJECT_IS_DEPENDENCY=On
|
61 |
+
-Dquickcpplib_FOUND=1
|
62 |
+
-DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles
|
63 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
|
64 |
+
)
|
65 |
+
|
66 |
+
if("run-tests" IN_LIST FEATURES)
|
67 |
+
vcpkg_build_cmake(TARGET test)
|
68 |
+
endif()
|
69 |
+
|
70 |
+
vcpkg_install_cmake()
|
71 |
+
|
72 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/outcome)
|
73 |
+
|
74 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
|
75 |
+
|
76 |
+
file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
77 |
+
file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package outcome provides CMake targets:
|
2 |
+
|
3 |
+
find_package(outcome CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PUBLIC outcome::hl)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/outcome/vcpkg.json
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "outcome",
|
3 |
+
"version-string": "2.2.2-20211208",
|
4 |
+
"description": "Provides very lightweight outcome<T> and result<T> (non-Boost edition)",
|
5 |
+
"homepage": "https://github.com/ned14/outcome",
|
6 |
+
"supports": "!uwp",
|
7 |
+
"dependencies": [
|
8 |
+
"ned14-internal-quickcpplib",
|
9 |
+
"status-code"
|
10 |
+
],
|
11 |
+
"features": {
|
12 |
+
"run-tests": {
|
13 |
+
"description": "Build and run the dependency validation tests"
|
14 |
+
}
|
15 |
+
}
|
16 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv/portfile.cmake
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# header-only library
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO p-ranav/csv
|
6 |
+
REF 13e04e5b31b585855c7d7e7f3c65e47ae863569b
|
7 |
+
SHA512 ddcdc7af68a0dabb2b7e15822f5900461b9f424ff5e0ac6cafd2454c2f21ca97785ef09ddb805a92e2452fe14c14167c762a822a8af6c5b86446f67e7f3f71bd
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_configure_cmake(
|
12 |
+
SOURCE_PATH ${SOURCE_PATH}
|
13 |
+
PREFER_NINJA
|
14 |
+
OPTIONS
|
15 |
+
-DCSV_BUILD_TESTS=OFF
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_install_cmake()
|
19 |
+
|
20 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
|
21 |
+
|
22 |
+
# Handle copyright
|
23 |
+
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "p-ranav-csv",
|
3 |
+
"version-string": "2019-07-11",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "[deprecated] CSV for modern C++",
|
6 |
+
"homepage": "https://github.com/p-ranav/csv"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv2/portfile.cmake
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# header-only library
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO p-ranav/csv2
|
6 |
+
REF a20992f7a1b75215609037c4cc66f690e8691aab
|
7 |
+
SHA512 4459f34d3d3d2c256743d93dd9c66ac584366120e3c8829173e6f047bf7dce2b08284c82af360a274dea0d43f5d6e1c84bcae51bf4de97751cf41a2fd48cb62b
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_configure_cmake(
|
12 |
+
SOURCE_PATH ${SOURCE_PATH}
|
13 |
+
PREFER_NINJA
|
14 |
+
OPTIONS
|
15 |
+
-DCSV2_BUILD_TESTS=OFF
|
16 |
+
-DCSV2_SAMPLES=OFF
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_install_cmake()
|
20 |
+
|
21 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
|
22 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/licenses)
|
23 |
+
|
24 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
25 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE.mio DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
26 |
+
|
27 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/p-ranav-csv2/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "p-ranav-csv2",
|
3 |
+
"version-string": "2020-12-14",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "CSV for modern C++",
|
6 |
+
"homepage": "https://github.com/p-ranav/csv2"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/disable-C4701.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 96653ba..1afaafa 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -80,7 +80,7 @@ endif()
|
6 |
+
if(YACMA_COMPILER_IS_MSVC)
|
7 |
+
# Disable the idiotic minmax macros on MSVC, some annoying warnings,
|
8 |
+
# enable the bigobj option and the WIN32_LEAN_AND_MEAN definition.
|
9 |
+
- list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN")
|
10 |
+
+ list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/wd4701" "/bigobj" "-DWIN32_LEAN_AND_MEAN")
|
11 |
+
list(APPEND PAGMO_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN")
|
12 |
+
# Enable strict conformance mode, if supported.
|
13 |
+
set(CMAKE_REQUIRED_QUIET TRUE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/disable-md-override.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 96653ba..549d9d4 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -141,6 +141,7 @@ endif()
|
6 |
+
# Boost setup.
|
7 |
+
include(PagmoFindBoost)
|
8 |
+
|
9 |
+
+if(0)
|
10 |
+
# Explanation: on MSVC, when building static libraries, it is good practice to link
|
11 |
+
# to the static runtime. CMake, however, is hard-coded to link to the dynamic runtime.
|
12 |
+
# Hence we hackishly replace the /MD flag with /MT. This is the approach suggested
|
13 |
+
@@ -161,6 +162,7 @@ if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY)
|
14 |
+
endif()
|
15 |
+
endforeach()
|
16 |
+
endif()
|
17 |
+
+endif()
|
18 |
+
|
19 |
+
# List of source files.
|
20 |
+
set(PAGMO_SRC_FILES
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/find-tbb.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/pagmo-config.cmake.in b/pagmo-config.cmake.in
|
2 |
+
index 9553fc8..cb5e90b 100644
|
3 |
+
--- a/pagmo-config.cmake.in
|
4 |
+
+++ b/pagmo-config.cmake.in
|
5 |
+
@@ -8,6 +8,7 @@ set(THREADS_PREFER_PTHREAD_FLAG YES)
|
6 |
+
find_package(Threads REQUIRED)
|
7 |
+
unset(THREADS_PREFER_PTHREAD_FLAG)
|
8 |
+
include(PagmoFindBoost)
|
9 |
+
+find_package(TBB REQUIRED)
|
10 |
+
@_PAGMO_CONFIG_OPTIONAL_DEPS@
|
11 |
+
# Restore original module path.
|
12 |
+
set(CMAKE_MODULE_PATH "${_PAGMO_CONFIG_OLD_MODULE_PATH}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/portfile.cmake
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO esa/pagmo2
|
4 |
+
REF v2.16.1
|
5 |
+
SHA512 dac85a8525316e827df809d187d40f14dc20db7119796b7384d7855f83ba37e0bb595f6d8199053aac857460816929dd599c9d43802f2ed920a6f42dd2f16a03
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
"disable-C4701.patch"
|
9 |
+
"disable-md-override.patch"
|
10 |
+
"find-tbb.patch"
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
FEATURES
|
15 |
+
nlopt PAGMO_WITH_NLOPT
|
16 |
+
)
|
17 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY)
|
18 |
+
vcpkg_configure_cmake(
|
19 |
+
SOURCE_PATH ${SOURCE_PATH}
|
20 |
+
PREFER_NINJA
|
21 |
+
OPTIONS
|
22 |
+
${FEATURE_OPTIONS}
|
23 |
+
-DPAGMO_WITH_EIGEN3=ON
|
24 |
+
-DPAGMO_BUILD_STATIC_LIBRARY=${PAGMO_BUILD_STATIC_LIBRARY}
|
25 |
+
)
|
26 |
+
|
27 |
+
vcpkg_install_cmake()
|
28 |
+
|
29 |
+
vcpkg_copy_pdbs()
|
30 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pagmo)
|
31 |
+
|
32 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
33 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
34 |
+
|
35 |
+
file(INSTALL ${SOURCE_PATH}/COPYING.lgpl3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
36 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/pagmo2/vcpkg.json
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "pagmo2",
|
3 |
+
"version": "2.16.1",
|
4 |
+
"description": "A C++ platform to perform parallel computations of optimisation tasks (global and local) via the asynchronous generalized island model.",
|
5 |
+
"homepage": "https://esa.github.io/pagmo2/",
|
6 |
+
"dependencies": [
|
7 |
+
"boost-any",
|
8 |
+
"boost-graph",
|
9 |
+
"boost-serialization",
|
10 |
+
"eigen3",
|
11 |
+
"tbb"
|
12 |
+
],
|
13 |
+
"features": {
|
14 |
+
"nlopt": {
|
15 |
+
"description": "Enable the NLopt wrappers",
|
16 |
+
"dependencies": [
|
17 |
+
"nlopt"
|
18 |
+
]
|
19 |
+
}
|
20 |
+
}
|
21 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/fix-install-path.patch
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index aa4ad05..669adde 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC)
|
6 |
+
MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both")
|
7 |
+
ENDIF()
|
8 |
+
|
9 |
+
-IF(PAHO_BUILD_DEB_PACKAGE)
|
10 |
+
- set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt)
|
11 |
+
+IF(1)
|
12 |
+
+ set(CMAKE_INSTALL_DOCDIR share/paho-mqtt)
|
13 |
+
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
|
14 |
+
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
|
15 |
+
ENDIF()
|
16 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
17 |
+
index 0bc7194..db4a0ac 100644
|
18 |
+
--- a/src/CMakeLists.txt
|
19 |
+
+++ b/src/CMakeLists.txt
|
20 |
+
@@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC)
|
21 |
+
ENDIF()
|
22 |
+
|
23 |
+
INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h MQTTExportDeclarations.h
|
24 |
+
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
25 |
+
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt)
|
26 |
+
|
27 |
+
IF (PAHO_WITH_SSL)
|
28 |
+
SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/SHA1.c b/src/SHA1.c
|
2 |
+
index 3ef07d9..f0e82ce 100644
|
3 |
+
--- a/src/SHA1.c
|
4 |
+
+++ b/src/SHA1.c
|
5 |
+
@@ -19,6 +19,7 @@
|
6 |
+
#if !defined(OPENSSL)
|
7 |
+
#if defined(_WIN32) || defined(_WIN64)
|
8 |
+
#pragma comment(lib, "crypt32.lib")
|
9 |
+
+#pragma comment(lib, "Advapi32.lib")
|
10 |
+
|
11 |
+
int SHA1_Init(SHA_CTX *c)
|
12 |
+
{
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/portfile.cmake
ADDED
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO eclipse/paho.mqtt.c
|
4 |
+
REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9
|
5 |
+
SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
remove_compiler_options.patch
|
9 |
+
fix-install-path.patch
|
10 |
+
fix-unresolvedsymbol-arm.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
|
14 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC)
|
15 |
+
|
16 |
+
vcpkg_configure_cmake(
|
17 |
+
SOURCE_PATH ${SOURCE_PATH}
|
18 |
+
PREFER_NINJA
|
19 |
+
OPTIONS
|
20 |
+
-DPAHO_WITH_SSL=TRUE
|
21 |
+
-DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC}
|
22 |
+
-DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC}
|
23 |
+
-DPAHO_ENABLE_TESTING=FALSE
|
24 |
+
)
|
25 |
+
|
26 |
+
vcpkg_install_cmake()
|
27 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c TARGET_PATH share/eclipse-paho-mqtt-c)
|
28 |
+
vcpkg_copy_pdbs()
|
29 |
+
|
30 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
31 |
+
vcpkg_copy_tools(TOOL_NAMES MQTTVersion AUTO_CLEAN)
|
32 |
+
endif()
|
33 |
+
|
34 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
35 |
+
|
36 |
+
file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
37 |
+
file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/remove_compiler_options.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 531c39c..3df385a 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -41,7 +41,7 @@ IF (PAHO_HIGH_PERFORMANCE)
|
6 |
+
ENDIF()
|
7 |
+
|
8 |
+
IF(WIN32)
|
9 |
+
- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD)
|
10 |
+
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN)
|
11 |
+
ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
12 |
+
ADD_DEFINITIONS(-DOSX)
|
13 |
+
ENDIF()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqtt/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "paho-mqtt",
|
3 |
+
"version-semver": "1.3.9",
|
4 |
+
"description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things",
|
5 |
+
"homepage": "https://github.com/eclipse/paho.mqtt.c",
|
6 |
+
"dependencies": [
|
7 |
+
"openssl"
|
8 |
+
]
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/fix-dependency.patch
ADDED
@@ -0,0 +1,84 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
2 |
+
index a9f8908..5c98f3f 100644
|
3 |
+
--- a/cmake/CMakeLists.txt
|
4 |
+
+++ b/cmake/CMakeLists.txt
|
5 |
+
@@ -17,6 +17,5 @@ install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name}
|
6 |
+
|
7 |
+
install(FILES
|
8 |
+
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
|
9 |
+
- FindPahoMqttC.cmake
|
10 |
+
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
|
11 |
+
DESTINATION lib/cmake/${package_name})
|
12 |
+
diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in
|
13 |
+
index 164e123..9beac1c 100644
|
14 |
+
--- a/cmake/PahoMqttCppConfig.cmake.in
|
15 |
+
+++ b/cmake/PahoMqttCppConfig.cmake.in
|
16 |
+
@@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@)
|
17 |
+
|
18 |
+
include(CMakeFindDependencyMacro)
|
19 |
+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
20 |
+
-find_dependency(PahoMqttC REQUIRED)
|
21 |
+
+find_dependency(eclipse-paho-mqtt-c REQUIRED)
|
22 |
+
list(REMOVE_AT CMAKE_MODULE_PATH -1)
|
23 |
+
find_dependency(Threads REQUIRED)
|
24 |
+
|
25 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
26 |
+
index 3d43595..a25f74d 100644
|
27 |
+
--- a/src/CMakeLists.txt
|
28 |
+
+++ b/src/CMakeLists.txt
|
29 |
+
@@ -23,7 +23,7 @@
|
30 |
+
# Frank Pagliughi - made the shared library optional
|
31 |
+
#*******************************************************************************/
|
32 |
+
|
33 |
+
-find_package(PahoMqttC REQUIRED)
|
34 |
+
+find_package(eclipse-paho-mqtt-c CONFIG REQUIRED)
|
35 |
+
|
36 |
+
# --- The headers ---
|
37 |
+
|
38 |
+
@@ -81,13 +81,21 @@ target_include_directories(paho-cpp-objs
|
39 |
+
## --- Build the shared library, if requested ---
|
40 |
+
|
41 |
+
if(PAHO_BUILD_SHARED)
|
42 |
+
+ ## set PAHO_C_LIB
|
43 |
+
+ if(PAHO_WITH_SSL)
|
44 |
+
+ find_package(OpenSSL REQUIRED)
|
45 |
+
+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs)
|
46 |
+
+ else()
|
47 |
+
+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c)
|
48 |
+
+ endif()
|
49 |
+
+
|
50 |
+
## create the shared library
|
51 |
+
add_library(paho-mqttpp3 SHARED $<TARGET_OBJECTS:paho-cpp-objs>)
|
52 |
+
|
53 |
+
## add dependencies to the shared library
|
54 |
+
target_link_libraries(paho-mqttpp3
|
55 |
+
PRIVATE ${LIBS_SYSTEM}
|
56 |
+
- PUBLIC PahoMqttC::PahoMqttC Threads::Threads)
|
57 |
+
+ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads)
|
58 |
+
|
59 |
+
# It would be nice to exort the include paths from the obj lib, but we
|
60 |
+
# get an export error. Perhaps in a future version?
|
61 |
+
@@ -119,13 +127,22 @@ endif()
|
62 |
+
## --- Build static version of the library, if requested ---
|
63 |
+
|
64 |
+
if(PAHO_BUILD_STATIC)
|
65 |
+
+
|
66 |
+
+ ## set PAHO_C_LIB
|
67 |
+
+ if(PAHO_WITH_SSL)
|
68 |
+
+ find_package(OpenSSL REQUIRED)
|
69 |
+
+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static)
|
70 |
+
+ else()
|
71 |
+
+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a-static eclipse-paho-mqtt-c::paho-mqtt3c-static)
|
72 |
+
+ endif()
|
73 |
+
+
|
74 |
+
## create the static library
|
75 |
+
add_library(paho-mqttpp3-static STATIC $<TARGET_OBJECTS:paho-cpp-objs>)
|
76 |
+
|
77 |
+
## add dependencies to the shared library
|
78 |
+
target_link_libraries(paho-mqttpp3-static
|
79 |
+
PRIVATE ${LIBS_SYSTEM}
|
80 |
+
- PUBLIC PahoMqttC::PahoMqttC Threads::Threads)
|
81 |
+
+ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads)
|
82 |
+
|
83 |
+
target_include_directories(paho-mqttpp3-static PUBLIC
|
84 |
+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/fix-include-path.patch
ADDED
@@ -0,0 +1,249 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h
|
2 |
+
index 7fb13a4..59247ca 100644
|
3 |
+
--- a/src/mqtt/async_client.h
|
4 |
+
+++ b/src/mqtt/async_client.h
|
5 |
+
@@ -25,7 +25,7 @@
|
6 |
+
#ifndef __mqtt_async_client_h
|
7 |
+
#define __mqtt_async_client_h
|
8 |
+
|
9 |
+
-#include "MQTTAsync.h"
|
10 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
11 |
+
#include "mqtt/types.h"
|
12 |
+
#include "mqtt/token.h"
|
13 |
+
#include "mqtt/create_options.h"
|
14 |
+
diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h
|
15 |
+
index 63f21a1..c4638fa 100644
|
16 |
+
--- a/src/mqtt/callback.h
|
17 |
+
+++ b/src/mqtt/callback.h
|
18 |
+
@@ -24,7 +24,7 @@
|
19 |
+
#ifndef __mqtt_callback_h
|
20 |
+
#define __mqtt_callback_h
|
21 |
+
|
22 |
+
-#include "MQTTAsync.h"
|
23 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
24 |
+
#include "mqtt/delivery_token.h"
|
25 |
+
#include "mqtt/types.h"
|
26 |
+
#include <vector>
|
27 |
+
diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h
|
28 |
+
index 8001fe3..650ba91 100644
|
29 |
+
--- a/src/mqtt/connect_options.h
|
30 |
+
+++ b/src/mqtt/connect_options.h
|
31 |
+
@@ -24,7 +24,7 @@
|
32 |
+
#ifndef __mqtt_connect_options_h
|
33 |
+
#define __mqtt_connect_options_h
|
34 |
+
|
35 |
+
-#include "MQTTAsync.h"
|
36 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
37 |
+
#include "mqtt/types.h"
|
38 |
+
#include "mqtt/message.h"
|
39 |
+
#include "mqtt/topic.h"
|
40 |
+
diff --git a/src/mqtt/create_options.h b/src/mqtt/create_options.h
|
41 |
+
index d57e32b..2bb3561 100644
|
42 |
+
--- a/src/mqtt/create_options.h
|
43 |
+
+++ b/src/mqtt/create_options.h
|
44 |
+
@@ -24,7 +24,7 @@
|
45 |
+
#ifndef __mqtt_create_options_h
|
46 |
+
#define __mqtt_create_options_h
|
47 |
+
|
48 |
+
-#include "MQTTAsync.h"
|
49 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
50 |
+
#include "mqtt/types.h"
|
51 |
+
|
52 |
+
namespace mqtt {
|
53 |
+
diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h
|
54 |
+
index b70d582..ee1b306 100644
|
55 |
+
--- a/src/mqtt/delivery_token.h
|
56 |
+
+++ b/src/mqtt/delivery_token.h
|
57 |
+
@@ -24,7 +24,7 @@
|
58 |
+
#ifndef __mqtt_delivery_token_h
|
59 |
+
#define __mqtt_delivery_token_h
|
60 |
+
|
61 |
+
-#include "MQTTAsync.h"
|
62 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
63 |
+
#include "mqtt/token.h"
|
64 |
+
#include "mqtt/message.h"
|
65 |
+
#include <memory>
|
66 |
+
diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h
|
67 |
+
index db93679..2739d89 100644
|
68 |
+
--- a/src/mqtt/disconnect_options.h
|
69 |
+
+++ b/src/mqtt/disconnect_options.h
|
70 |
+
@@ -23,7 +23,7 @@
|
71 |
+
#ifndef __mqtt_disconnect_options_h
|
72 |
+
#define __mqtt_disconnect_options_h
|
73 |
+
|
74 |
+
-#include "MQTTAsync.h"
|
75 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
76 |
+
#include "mqtt/types.h"
|
77 |
+
#include "mqtt/token.h"
|
78 |
+
#include "mqtt/properties.h"
|
79 |
+
diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h
|
80 |
+
index 9db330a..32b7c97 100644
|
81 |
+
--- a/src/mqtt/exception.h
|
82 |
+
+++ b/src/mqtt/exception.h
|
83 |
+
@@ -24,7 +24,7 @@
|
84 |
+
#ifndef __mqtt_exception_h
|
85 |
+
#define __mqtt_exception_h
|
86 |
+
|
87 |
+
-#include "MQTTAsync.h"
|
88 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
89 |
+
#include "mqtt/types.h"
|
90 |
+
#include <iostream>
|
91 |
+
#include <vector>
|
92 |
+
diff --git a/src/mqtt/iaction_listener.h b/src/mqtt/iaction_listener.h
|
93 |
+
index 1e34577..2af8c1b 100644
|
94 |
+
--- a/src/mqtt/iaction_listener.h
|
95 |
+
+++ b/src/mqtt/iaction_listener.h
|
96 |
+
@@ -24,7 +24,7 @@
|
97 |
+
#ifndef __mqtt_iaction_listener_h
|
98 |
+
#define __mqtt_iaction_listener_h
|
99 |
+
|
100 |
+
-#include "MQTTAsync.h"
|
101 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
102 |
+
#include "mqtt/types.h"
|
103 |
+
#include <vector>
|
104 |
+
|
105 |
+
diff --git a/src/mqtt/iclient_persistence.h b/src/mqtt/iclient_persistence.h
|
106 |
+
index 635a292..aedc1d9 100644
|
107 |
+
--- a/src/mqtt/iclient_persistence.h
|
108 |
+
+++ b/src/mqtt/iclient_persistence.h
|
109 |
+
@@ -24,7 +24,7 @@
|
110 |
+
#ifndef __mqtt_iclient_persistence_h
|
111 |
+
#define __mqtt_iclient_persistence_h
|
112 |
+
|
113 |
+
-#include "MQTTAsync.h"
|
114 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
115 |
+
#include "mqtt/types.h"
|
116 |
+
#include "mqtt/buffer_view.h"
|
117 |
+
#include "mqtt/string_collection.h"
|
118 |
+
diff --git a/src/mqtt/message.h b/src/mqtt/message.h
|
119 |
+
index 4cb95a6..e036269 100644
|
120 |
+
--- a/src/mqtt/message.h
|
121 |
+
+++ b/src/mqtt/message.h
|
122 |
+
@@ -25,7 +25,7 @@
|
123 |
+
#ifndef __mqtt_message_h
|
124 |
+
#define __mqtt_message_h
|
125 |
+
|
126 |
+
-#include "MQTTAsync.h"
|
127 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
128 |
+
#include "mqtt/buffer_ref.h"
|
129 |
+
#include "mqtt/properties.h"
|
130 |
+
#include "mqtt/exception.h"
|
131 |
+
diff --git a/src/mqtt/properties.h b/src/mqtt/properties.h
|
132 |
+
index 826bc97..42c286a 100644
|
133 |
+
--- a/src/mqtt/properties.h
|
134 |
+
+++ b/src/mqtt/properties.h
|
135 |
+
@@ -25,7 +25,7 @@
|
136 |
+
#define __mqtt_properties_h
|
137 |
+
|
138 |
+
extern "C" {
|
139 |
+
- #include "MQTTProperties.h"
|
140 |
+
+ #include "paho-mqtt/MQTTAsync.h"
|
141 |
+
}
|
142 |
+
|
143 |
+
#include "mqtt/types.h"
|
144 |
+
diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h
|
145 |
+
index 7bcb45c..40e45a2 100644
|
146 |
+
--- a/src/mqtt/response_options.h
|
147 |
+
+++ b/src/mqtt/response_options.h
|
148 |
+
@@ -7,7 +7,7 @@
|
149 |
+
#ifndef __mqtt_response_options_h
|
150 |
+
#define __mqtt_response_options_h
|
151 |
+
|
152 |
+
-#include "MQTTAsync.h"
|
153 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
154 |
+
#include "mqtt/token.h"
|
155 |
+
#include "mqtt/delivery_token.h"
|
156 |
+
#include "subscribe_options.h"
|
157 |
+
diff --git a/src/mqtt/server_response.h b/src/mqtt/server_response.h
|
158 |
+
index a111839..094135b 100644
|
159 |
+
--- a/src/mqtt/server_response.h
|
160 |
+
+++ b/src/mqtt/server_response.h
|
161 |
+
@@ -24,7 +24,7 @@
|
162 |
+
#ifndef __mqtt_server_response_h
|
163 |
+
#define __mqtt_server_response_h
|
164 |
+
|
165 |
+
-#include "MQTTAsync.h"
|
166 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
167 |
+
#include "mqtt/types.h"
|
168 |
+
#include "mqtt/properties.h"
|
169 |
+
|
170 |
+
diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h
|
171 |
+
index eba49ed..aad0da3 100644
|
172 |
+
--- a/src/mqtt/ssl_options.h
|
173 |
+
+++ b/src/mqtt/ssl_options.h
|
174 |
+
@@ -27,7 +27,7 @@
|
175 |
+
#ifndef __mqtt_ssl_options_h
|
176 |
+
#define __mqtt_ssl_options_h
|
177 |
+
|
178 |
+
-#include "MQTTAsync.h"
|
179 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
180 |
+
#include "mqtt/message.h"
|
181 |
+
#include "mqtt/topic.h"
|
182 |
+
#include "mqtt/types.h"
|
183 |
+
diff --git a/src/mqtt/string_collection.h b/src/mqtt/string_collection.h
|
184 |
+
index bc43775..99a2674 100644
|
185 |
+
--- a/src/mqtt/string_collection.h
|
186 |
+
+++ b/src/mqtt/string_collection.h
|
187 |
+
@@ -24,7 +24,7 @@
|
188 |
+
#ifndef __mqtt_string_collection_h
|
189 |
+
#define __mqtt_string_collection_h
|
190 |
+
|
191 |
+
-#include "MQTTAsync.h"
|
192 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
193 |
+
#include "mqtt/types.h"
|
194 |
+
#include <vector>
|
195 |
+
#include <map>
|
196 |
+
diff --git a/src/mqtt/subscribe_options.h b/src/mqtt/subscribe_options.h
|
197 |
+
index 753c811..5f0d86c 100644
|
198 |
+
--- a/src/mqtt/subscribe_options.h
|
199 |
+
+++ b/src/mqtt/subscribe_options.h
|
200 |
+
@@ -24,8 +24,8 @@
|
201 |
+
#ifndef __mqtt_subscribe_options_h
|
202 |
+
#define __mqtt_subscribe_options_h
|
203 |
+
|
204 |
+
-#include "MQTTAsync.h"
|
205 |
+
-#include "MQTTSubscribeOpts.h"
|
206 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
207 |
+
+#include "paho-mqtt/MQTTSubscribeOpts.h"
|
208 |
+
#include "mqtt/types.h"
|
209 |
+
|
210 |
+
namespace mqtt {
|
211 |
+
diff --git a/src/mqtt/token.h b/src/mqtt/token.h
|
212 |
+
index 4cafda7..1815ab9 100644
|
213 |
+
--- a/src/mqtt/token.h
|
214 |
+
+++ b/src/mqtt/token.h
|
215 |
+
@@ -25,7 +25,7 @@
|
216 |
+
#ifndef __mqtt_token_h
|
217 |
+
#define __mqtt_token_h
|
218 |
+
|
219 |
+
-#include "MQTTAsync.h"
|
220 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
221 |
+
#include "mqtt/iaction_listener.h"
|
222 |
+
#include "mqtt/exception.h"
|
223 |
+
#include "mqtt/types.h"
|
224 |
+
diff --git a/src/mqtt/topic.h b/src/mqtt/topic.h
|
225 |
+
index 618eb85..555de60 100644
|
226 |
+
--- a/src/mqtt/topic.h
|
227 |
+
+++ b/src/mqtt/topic.h
|
228 |
+
@@ -24,7 +24,7 @@
|
229 |
+
#ifndef __mqtt_topic_h
|
230 |
+
#define __mqtt_topic_h
|
231 |
+
|
232 |
+
-#include "MQTTAsync.h"
|
233 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
234 |
+
#include "mqtt/delivery_token.h"
|
235 |
+
#include "mqtt/subscribe_options.h"
|
236 |
+
#include "mqtt/message.h"
|
237 |
+
diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h
|
238 |
+
index 8c5c67d..63bfffc 100644
|
239 |
+
--- a/src/mqtt/will_options.h
|
240 |
+
+++ b/src/mqtt/will_options.h
|
241 |
+
@@ -26,7 +26,7 @@
|
242 |
+
#ifndef __mqtt_will_options_h
|
243 |
+
#define __mqtt_will_options_h
|
244 |
+
|
245 |
+
-#include "MQTTAsync.h"
|
246 |
+
+#include "paho-mqtt/MQTTAsync.h"
|
247 |
+
#include "mqtt/types.h"
|
248 |
+
#include "mqtt/message.h"
|
249 |
+
#include "mqtt/topic.h"
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/portfile.cmake
ADDED
@@ -0,0 +1,67 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Download from Github
|
2 |
+
vcpkg_from_github(
|
3 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
4 |
+
REPO eclipse/paho.mqtt.cpp
|
5 |
+
REF 33921c8b68b351828650c36816e7ecf936764379 #v1.2.0
|
6 |
+
SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55
|
7 |
+
HEAD_REF master
|
8 |
+
PATCHES
|
9 |
+
fix-include-path.patch
|
10 |
+
fix-dependency.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
FEATURES
|
15 |
+
"ssl" PAHO_WITH_SSL
|
16 |
+
)
|
17 |
+
|
18 |
+
# Link with 'paho-mqtt3as' library
|
19 |
+
set(PAHO_C_LIBNAME paho-mqtt3as)
|
20 |
+
|
21 |
+
# Setting the library path
|
22 |
+
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
23 |
+
set(PAHO_C_LIBRARY_PATH "${CURRENT_INSTALLED_DIR}/lib")
|
24 |
+
else()
|
25 |
+
set(PAHO_C_LIBRARY_PATH "${CURRENT_INSTALLED_DIR}/debug/lib")
|
26 |
+
endif()
|
27 |
+
|
28 |
+
# Setting the include path where MqttClient.h is present
|
29 |
+
set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include")
|
30 |
+
|
31 |
+
|
32 |
+
# NOTE: the Paho C++ cmake files on Github are problematic.
|
33 |
+
# It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable.
|
34 |
+
# Unless the open source community cleans up the cmake files, we are stuck with setting both of them.
|
35 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
36 |
+
set(PAHO_MQTTPP3_STATIC ON)
|
37 |
+
set(PAHO_MQTTPP3_SHARED OFF)
|
38 |
+
set(PAHO_C_LIB "${PAHO_C_LIBRARY_PATH}/${PAHO_C_LIBNAME}")
|
39 |
+
set(PAHO_OPTIONS -DPAHO_MQTT_C_LIBRARIES=${PAHO_C_LIB})
|
40 |
+
else()
|
41 |
+
set(PAHO_MQTTPP3_STATIC OFF)
|
42 |
+
set(PAHO_MQTTPP3_SHARED ON)
|
43 |
+
set(PAHO_OPTIONS)
|
44 |
+
endif()
|
45 |
+
|
46 |
+
vcpkg_configure_cmake(
|
47 |
+
SOURCE_PATH ${SOURCE_PATH}
|
48 |
+
PREFER_NINJA
|
49 |
+
OPTIONS
|
50 |
+
-DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC}
|
51 |
+
-DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED}
|
52 |
+
-DPAHO_MQTT_C_INCLUDE_DIRS=${PAHO_C_INC}
|
53 |
+
${FEATURE_OPTIONS}
|
54 |
+
${PAHO_OPTIONS}
|
55 |
+
)
|
56 |
+
|
57 |
+
# Run the build, copy pdbs and fixup the cmake targets
|
58 |
+
vcpkg_install_cmake()
|
59 |
+
vcpkg_copy_pdbs()
|
60 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/PahoMqttCpp" TARGET_PATH "share/pahomqttcpp")
|
61 |
+
|
62 |
+
# Remove the include and share folders in debug folder
|
63 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
64 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
65 |
+
|
66 |
+
# Add copyright
|
67 |
+
file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/paho-mqttpp3/vcpkg.json
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "paho-mqttpp3",
|
3 |
+
"version": "1.2.0",
|
4 |
+
"description": "Paho project provides open-source C++ wrapper for Paho C library",
|
5 |
+
"homepage": "https://github.com/eclipse/paho.mqtt.cpp",
|
6 |
+
"dependencies": [
|
7 |
+
"paho-mqtt"
|
8 |
+
],
|
9 |
+
"default-features": [
|
10 |
+
"ssl"
|
11 |
+
],
|
12 |
+
"features": {
|
13 |
+
"ssl": {
|
14 |
+
"description": "Build with SSL support",
|
15 |
+
"dependencies": [
|
16 |
+
"openssl"
|
17 |
+
]
|
18 |
+
}
|
19 |
+
}
|
20 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/palsigslot/portfile.cmake
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO palacaze/sigslot
|
4 |
+
REF v1.2.1
|
5 |
+
SHA512 cd79985a09ad41562dc8e582d30bc9df0fdc9409ee3676919b56d0d70a6c1af9414587b61977d2fa2ba763ef8df65b30c7b7dc883629e016660baeb998e708f5
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
11 |
+
OPTIONS
|
12 |
+
-DSIGSLOT_COMPILE_EXAMPLES=OFF
|
13 |
+
-DSIGSLOT_COMPILE_TESTS=OFF
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_cmake_install()
|
17 |
+
|
18 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME PalSigslot CONFIG_PATH lib/cmake/PalSigslot)
|
19 |
+
|
20 |
+
file(REMOVE_RECURSE
|
21 |
+
"${CURRENT_PACKAGES_DIR}/debug"
|
22 |
+
"${CURRENT_PACKAGES_DIR}/lib"
|
23 |
+
)
|
24 |
+
|
25 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/palsigslot/vcpkg.json
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "palsigslot",
|
3 |
+
"version": "1.2.1",
|
4 |
+
"description": "A header-only, thread safe implementation of signal-slots for C++.",
|
5 |
+
"homepage": "https://github.com/palacaze/sigslot",
|
6 |
+
"dependencies": [
|
7 |
+
{
|
8 |
+
"name": "vcpkg-cmake",
|
9 |
+
"host": true
|
10 |
+
},
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake-config",
|
13 |
+
"host": true
|
14 |
+
}
|
15 |
+
]
|
16 |
+
}
|