Spaces:
Sleeping
Sleeping
b19712019d5cf2da75467f8a2ea1bb2a313b21633e77a777a6f22326e1787900
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/environment-overrides.cmake +16 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch +77 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/portfile.cmake +119 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/toolchain_fixes.patch +231 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/vcpkg.json +46 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/fix-dependency.patch +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/fix-findimgui.patch +65 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/portfile.cmake +132 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/toolchain_fixes.patch +265 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/vcpkg.json +77 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch +29 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/portfile.cmake +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/vcpkg.json +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/0001_Export_targets.patch +27 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/0002_Fix_config.patch +40 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/portfile.cmake +59 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/vcpkg.json +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/fix_boost_static_link.patch +17 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/fix_dependency.patch +128 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/portfile.cmake +89 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/vcpkg.json +46 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onednn/portfile.cmake +26 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onednn/vcpkg.json +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/fix-uwp.patch +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/portfile.cmake +54 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/vcpkg.json +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch +56 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/portfile.cmake +43 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/vcpkg.json +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/fix-cmakelists.patch +86 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/fix-dependency-protobuf.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/portfile.cmake +95 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/vcpkg.json +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnxruntime-gpu/portfile.cmake +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnxruntime-gpu/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/oof/portfile.cmake +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/oof/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/openssl.patch +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/portfile.cmake +44 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/vcpkg.json +41 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/portfile.cmake +96 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/usage +4 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/vcpkg.json +8 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-redefinition-function.patch +28 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-space-path.patch +43 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-uwp-build.patch +35 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/install-tools.patch +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/openblas_common.h +60 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/portfile.cmake +111 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/environment-overrides.cmake
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#[[
|
2 |
+
|
3 |
+
Building steps for ogre-next[d3d9]:
|
4 |
+
|
5 |
+
1. Download and install "Microsoft DirectX SDK"
|
6 |
+
https://www.microsoft.com/en-us/download/confirmation.aspx?id=6812
|
7 |
+
|
8 |
+
2. Set env variable
|
9 |
+
set DXSDK_DIR=C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)
|
10 |
+
|
11 |
+
3. Install port
|
12 |
+
.\vcpkg.exe install ogre-next[d3d9] --triplet x64-windows
|
13 |
+
|
14 |
+
]]
|
15 |
+
|
16 |
+
set(VCPKG_ENV_PASSTHROUGH DXSDK_DIR)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/fix_find_package_sdl2.patch
ADDED
@@ -0,0 +1,77 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
2 |
+
index 3f3e2d7..0cc9606 100644
|
3 |
+
--- a/CMake/Dependencies.cmake
|
4 |
+
+++ b/CMake/Dependencies.cmake
|
5 |
+
@@ -267,7 +267,7 @@ endif()
|
6 |
+
#######################################################################
|
7 |
+
|
8 |
+
# Find sdl2
|
9 |
+
-find_package(SDL2)
|
10 |
+
+find_package(SDL2 CONFIG REQUIRED)
|
11 |
+
macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "")
|
12 |
+
|
13 |
+
#######################################################################
|
14 |
+
diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake
|
15 |
+
index f98b358..e5eb9ed 100644
|
16 |
+
--- a/CMake/InstallDependencies.cmake
|
17 |
+
+++ b/CMake/InstallDependencies.cmake
|
18 |
+
@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES)
|
19 |
+
endif ()
|
20 |
+
|
21 |
+
if( OGRE_BUILD_SAMPLES2 )
|
22 |
+
- install_debug(SDL2.dll)
|
23 |
+
- install_release(SDL2.dll)
|
24 |
+
install_debug(openvr_api.dll)
|
25 |
+
install_release(openvr_api.dll)
|
26 |
+
install_debug(openvr_api.pdb)
|
27 |
+
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
|
28 |
+
index 4b42a51..793eb71 100644
|
29 |
+
--- a/CMake/Packages/FindSDL2.cmake
|
30 |
+
+++ b/CMake/Packages/FindSDL2.cmake
|
31 |
+
@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP)
|
32 |
+
INCLUDE(FindPackageHandleStandardArgs)
|
33 |
+
|
34 |
+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
|
35 |
+
- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
|
36 |
+
+ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR)
|
37 |
+
|
38 |
+
if (WIN32)
|
39 |
+
set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll
|
40 |
+
@@ -201,6 +201,6 @@ IF(SDL2_STATIC)
|
41 |
+
if (UNIX AND NOT APPLE)
|
42 |
+
EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
|
43 |
+
STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
|
44 |
+
- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
|
45 |
+
+ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS})
|
46 |
+
ENDIF()
|
47 |
+
ENDIF(SDL2_STATIC)
|
48 |
+
diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt
|
49 |
+
index b21601e..4ef90bd 100644
|
50 |
+
--- a/Samples/2.0/Common/CMakeLists.txt
|
51 |
+
+++ b/Samples/2.0/Common/CMakeLists.txt
|
52 |
+
@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES
|
53 |
+
|
54 |
+
link_directories(${CMAKE_CURRENT_BINARY_DIR})
|
55 |
+
|
56 |
+
-target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit)
|
57 |
+
+target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit)
|
58 |
+
diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
|
59 |
+
index 5e80709..3ba9b5a 100644
|
60 |
+
--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
|
61 |
+
+++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
|
62 |
+
@@ -224,13 +224,13 @@ endif()
|
63 |
+
|
64 |
+
if( NOT IOS )
|
65 |
+
set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" )
|
66 |
+
- find_package( SDL2 )
|
67 |
+
+ find_package(SDL2 CONFIG REQUIRED)
|
68 |
+
if( NOT SDL2_FOUND )
|
69 |
+
message( "Could not find SDL2. https://www.libsdl.org/" )
|
70 |
+
else()
|
71 |
+
message( STATUS "Found SDL2" )
|
72 |
+
include_directories( ${SDL2_INCLUDE_DIR} )
|
73 |
+
- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} )
|
74 |
+
+ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 )
|
75 |
+
endif()
|
76 |
+
endif()
|
77 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/portfile.cmake
ADDED
@@ -0,0 +1,119 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile.
|
2 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
|
3 |
+
message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
|
4 |
+
endif()
|
5 |
+
|
6 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
7 |
+
message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
|
8 |
+
endif()
|
9 |
+
|
10 |
+
vcpkg_from_github(
|
11 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
12 |
+
REPO OGRECave/ogre-next
|
13 |
+
REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0
|
14 |
+
SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81
|
15 |
+
HEAD_REF master
|
16 |
+
PATCHES
|
17 |
+
toolchain_fixes.patch
|
18 |
+
fix_find_package_sdl2.patch
|
19 |
+
)
|
20 |
+
|
21 |
+
file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
|
22 |
+
|
23 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
24 |
+
set(OGRE_STATIC ON)
|
25 |
+
else()
|
26 |
+
set(OGRE_STATIC OFF)
|
27 |
+
endif()
|
28 |
+
|
29 |
+
|
30 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
31 |
+
FEATURES
|
32 |
+
d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9
|
33 |
+
java OGRE_BUILD_COMPONENT_JAVA
|
34 |
+
python OGRE_BUILD_COMPONENT_PYTHON
|
35 |
+
csharp OGRE_BUILD_COMPONENT_CSHARP
|
36 |
+
)
|
37 |
+
|
38 |
+
vcpkg_cmake_configure(
|
39 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
40 |
+
OPTIONS
|
41 |
+
${FEATURE_OPTIONS}
|
42 |
+
-DOGRE_BUILD_DEPENDENCIES=OFF
|
43 |
+
-DOGRE_COPY_DEPENDENCIES=OFF
|
44 |
+
-DOGRE_BUILD_SAMPLES=OFF
|
45 |
+
-DOGRE_BUILD_TESTS=OFF
|
46 |
+
-DOGRE_BUILD_TOOLS=OFF
|
47 |
+
-DOGRE_BUILD_MSVC_MP=ON
|
48 |
+
-DOGRE_BUILD_MSVC_ZM=ON
|
49 |
+
-DOGRE_INSTALL_DEPENDENCIES=OFF
|
50 |
+
-DOGRE_INSTALL_DOCS=OFF
|
51 |
+
-DOGRE_INSTALL_PDB=OFF
|
52 |
+
-DOGRE_INSTALL_SAMPLES=OFF
|
53 |
+
-DOGRE_INSTALL_TOOLS=OFF
|
54 |
+
-DOGRE_INSTALL_VSPROPS=OFF
|
55 |
+
-DOGRE_STATIC=${OGRE_STATIC}
|
56 |
+
-DOGRE_CONFIG_THREAD_PROVIDER=std
|
57 |
+
-DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
|
58 |
+
-DOGRE_BUILD_RENDERSYSTEM_GL=ON
|
59 |
+
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
|
60 |
+
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
|
61 |
+
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
|
62 |
+
-DOGRE_CMAKE_DIR=share/ogre-next
|
63 |
+
)
|
64 |
+
vcpkg_cmake_install()
|
65 |
+
vcpkg_copy_pdbs()
|
66 |
+
|
67 |
+
vcpkg_cmake_config_fixup()
|
68 |
+
|
69 |
+
|
70 |
+
|
71 |
+
file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg")
|
72 |
+
if(REL_CFGS)
|
73 |
+
file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
74 |
+
file(REMOVE ${REL_CFGS})
|
75 |
+
endif()
|
76 |
+
|
77 |
+
file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg")
|
78 |
+
if(DBG_CFGS)
|
79 |
+
file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
80 |
+
file(REMOVE ${DBG_CFGS})
|
81 |
+
endif()
|
82 |
+
|
83 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
84 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
85 |
+
endif()
|
86 |
+
|
87 |
+
#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
|
88 |
+
#manual-link subfolder is here to the rescue!
|
89 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
90 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release")
|
91 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link")
|
92 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
93 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib")
|
94 |
+
else()
|
95 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib")
|
96 |
+
endif()
|
97 |
+
endif()
|
98 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug")
|
99 |
+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link")
|
100 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
101 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib")
|
102 |
+
else()
|
103 |
+
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib")
|
104 |
+
endif()
|
105 |
+
endif()
|
106 |
+
|
107 |
+
file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake")
|
108 |
+
foreach(SHARE_FILE ${SHARE_FILES})
|
109 |
+
file(READ "${SHARE_FILE}" _contents)
|
110 |
+
string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
|
111 |
+
file(WRITE "${SHARE_FILE}" "${_contents}")
|
112 |
+
endforeach()
|
113 |
+
endif()
|
114 |
+
|
115 |
+
# Handle copyright
|
116 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
117 |
+
|
118 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
119 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/toolchain_fixes.patch
ADDED
@@ -0,0 +1,231 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
2 |
+
index f3a62f2..b53df6f 100644
|
3 |
+
--- a/CMake/CMakeLists.txt
|
4 |
+
+++ b/CMake/CMakeLists.txt
|
5 |
+
@@ -13,10 +13,12 @@
|
6 |
+
# directory, but can also be used for custom projects.
|
7 |
+
#############################################################
|
8 |
+
|
9 |
+
-if(WIN32 OR APPLE)
|
10 |
+
- set(OGRE_CMAKE_DIR "CMake")
|
11 |
+
-else()
|
12 |
+
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
13 |
+
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
14 |
+
+ if(WIN32 OR APPLE)
|
15 |
+
+ set(OGRE_CMAKE_DIR "CMake")
|
16 |
+
+ else()
|
17 |
+
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
18 |
+
+ endif()
|
19 |
+
endif()
|
20 |
+
|
21 |
+
set(INST_FILES
|
22 |
+
diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
|
23 |
+
index 7c89ec5..d8314f0 100644
|
24 |
+
--- a/CMake/Packages/FindFreeImage.cmake
|
25 |
+
+++ b/CMake/Packages/FindFreeImage.cmake
|
26 |
+
@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
|
27 |
+
find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
28 |
+
find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
29 |
+
|
30 |
+
-make_library_set(FreeImage_LIBRARY)
|
31 |
+
+make_library_set(FreeImage)
|
32 |
+
|
33 |
+
findpkg_finish(FreeImage)
|
34 |
+
|
35 |
+
diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
|
36 |
+
index dd4b179..6f158fc 100644
|
37 |
+
--- a/CMake/Packages/FindGLSLOptimizer.cmake
|
38 |
+
+++ b/CMake/Packages/FindGLSLOptimizer.cmake
|
39 |
+
@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
|
40 |
+
find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
|
41 |
+
find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
42 |
+
find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
43 |
+
-make_library_set(GLSL_Optimizer_LIBRARY)
|
44 |
+
+make_library_set(GLSL_Optimizer)
|
45 |
+
|
46 |
+
findpkg_finish(GLSL_Optimizer)
|
47 |
+
add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
|
48 |
+
diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
|
49 |
+
index 7125895..13a306f 100644
|
50 |
+
--- a/CMake/Packages/FindHLSL2GLSL.cmake
|
51 |
+
+++ b/CMake/Packages/FindHLSL2GLSL.cmake
|
52 |
+
@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
|
53 |
+
find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
|
54 |
+
find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
55 |
+
find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
56 |
+
-make_library_set(HLSL2GLSL_LIBRARY)
|
57 |
+
+make_library_set(HLSL2GLSL)
|
58 |
+
|
59 |
+
findpkg_finish(HLSL2GLSL)
|
60 |
+
add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
|
61 |
+
diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
|
62 |
+
index 95c70cd..893ce01 100644
|
63 |
+
--- a/CMake/Packages/FindNVAPI.cmake
|
64 |
+
+++ b/CMake/Packages/FindNVAPI.cmake
|
65 |
+
@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
|
66 |
+
find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
|
67 |
+
find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
|
68 |
+
find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
|
69 |
+
-make_library_set(NVAPI_LIBRARY)
|
70 |
+
+make_library_set(NVAPI)
|
71 |
+
|
72 |
+
findpkg_finish(NVAPI)
|
73 |
+
add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
|
74 |
+
|
75 |
+
diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
|
76 |
+
index 6b6d7fa..3667b8b 100644
|
77 |
+
--- a/CMake/Packages/FindPOCO.cmake
|
78 |
+
+++ b/CMake/Packages/FindPOCO.cmake
|
79 |
+
@@ -50,7 +50,7 @@ findpkg_framework(POCO)
|
80 |
+
find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
|
81 |
+
find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
82 |
+
find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
83 |
+
-make_library_set(POCO_LIBRARY)
|
84 |
+
+make_library_set(POCO)
|
85 |
+
|
86 |
+
findpkg_finish(POCO)
|
87 |
+
|
88 |
+
@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES)
|
89 |
+
find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
|
90 |
+
find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
91 |
+
find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
92 |
+
-make_library_set(POCO_Util_LIBRARY)
|
93 |
+
+make_library_set(POCO_Util)
|
94 |
+
findpkg_finish(POCO_Util)
|
95 |
+
|
96 |
+
# Look for Poco's Net package
|
97 |
+
@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES)
|
98 |
+
find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
|
99 |
+
find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
100 |
+
find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
101 |
+
-make_library_set(POCO_Net_LIBRARY)
|
102 |
+
+make_library_set(POCO_Net)
|
103 |
+
findpkg_finish(POCO_Net)
|
104 |
+
|
105 |
+
# Look for Poco's NetSSL package
|
106 |
+
@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
|
107 |
+
find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
|
108 |
+
find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
109 |
+
find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
110 |
+
-make_library_set(POCO_NetSSL_LIBRARY)
|
111 |
+
+make_library_set(POCO_NetSSL)
|
112 |
+
findpkg_finish(POCO_NetSSL)
|
113 |
+
|
114 |
+
# Look for Poco's XML package
|
115 |
+
@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
|
116 |
+
find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
|
117 |
+
find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
118 |
+
find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
119 |
+
-make_library_set(POCO_XML_LIBRARY)
|
120 |
+
+make_library_set(POCO_XML)
|
121 |
+
findpkg_finish(POCO_XML)
|
122 |
+
|
123 |
+
diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
|
124 |
+
index 4200aa0..35e4ea3 100644
|
125 |
+
--- a/CMake/Packages/FindTBB.cmake
|
126 |
+
+++ b/CMake/Packages/FindTBB.cmake
|
127 |
+
@@ -104,7 +104,7 @@ findpkg_framework(TBB)
|
128 |
+
find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
129 |
+
find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
130 |
+
find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
131 |
+
-make_library_set(TBB_LIBRARY)
|
132 |
+
+make_library_set(TBB)
|
133 |
+
|
134 |
+
findpkg_finish(TBB)
|
135 |
+
|
136 |
+
@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
|
137 |
+
find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} )
|
138 |
+
find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
139 |
+
find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
140 |
+
-make_library_set(TBB_MALLOC_LIBRARY)
|
141 |
+
+make_library_set(TBB_MALLOC)
|
142 |
+
findpkg_finish(TBB_MALLOC)
|
143 |
+
|
144 |
+
# Look for TBB's malloc proxy package
|
145 |
+
@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
|
146 |
+
find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
147 |
+
find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
148 |
+
find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
149 |
+
-make_library_set(TBB_MALLOC_PROXY_LIBRARY)
|
150 |
+
+make_library_set(TBB_MALLOC_PROXY)
|
151 |
+
findpkg_finish(TBB_MALLOC_PROXY)
|
152 |
+
diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake
|
153 |
+
index c112071..214d9e5 100644
|
154 |
+
--- a/CMake/Packages/FindZZip.cmake
|
155 |
+
+++ b/CMake/Packages/FindZZip.cmake
|
156 |
+
@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib)
|
157 |
+
|
158 |
+
findpkg_framework(ZZip)
|
159 |
+
|
160 |
+
-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
161 |
+
+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
162 |
+
|
163 |
+
find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
164 |
+
find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
165 |
+
|
166 |
+
-make_library_set(ZZip_LIBRARY)
|
167 |
+
+make_library_set(ZZip)
|
168 |
+
|
169 |
+
findpkg_finish(ZZip)
|
170 |
+
|
171 |
+
diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
|
172 |
+
index 53111e0..8dffbbc 100644
|
173 |
+
--- a/CMake/Utils/FindPkgMacros.cmake
|
174 |
+
+++ b/CMake/Utils/FindPkgMacros.cmake
|
175 |
+
@@ -79,15 +79,21 @@ endmacro (use_pkgconfig)
|
176 |
+
|
177 |
+
# Couple a set of release AND debug libraries (or frameworks)
|
178 |
+
macro(make_library_set PREFIX)
|
179 |
+
- if (${PREFIX}_FWK)
|
180 |
+
- set(${PREFIX} ${${PREFIX}_FWK})
|
181 |
+
- elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
|
182 |
+
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
|
183 |
+
- elseif (${PREFIX}_REL)
|
184 |
+
- set(${PREFIX} ${${PREFIX}_REL})
|
185 |
+
- elseif (${PREFIX}_DBG)
|
186 |
+
- set(${PREFIX} ${${PREFIX}_DBG})
|
187 |
+
- endif ()
|
188 |
+
+ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
|
189 |
+
+ set(PREFIX_LIB "${PREFIX}_LIBRARY")
|
190 |
+
+ if (${PREFIX_LIB}_FWK)
|
191 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK})
|
192 |
+
+ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG)
|
193 |
+
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "")
|
194 |
+
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "")
|
195 |
+
+ select_library_configurations(${PREFIX})
|
196 |
+
+ elseif (${PREFIX_LIB}_REL)
|
197 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL})
|
198 |
+
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL})
|
199 |
+
+ elseif (${PREFIX_LIB}_DBG)
|
200 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG})
|
201 |
+
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG})
|
202 |
+
+ endif()
|
203 |
+
endmacro(make_library_set)
|
204 |
+
|
205 |
+
# Generate debug names from given release names
|
206 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
207 |
+
index 48af55b..b18ac57 100644
|
208 |
+
--- a/CMakeLists.txt
|
209 |
+
+++ b/CMakeLists.txt
|
210 |
+
@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
|
211 |
+
|
212 |
+
# Set build variables
|
213 |
+
set(XCODE_ATTRIBUTE_SDKROOT iphoneos)
|
214 |
+
- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
|
215 |
+
+ if(1)
|
216 |
+
execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
|
217 |
+
string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
|
218 |
+
else()
|
219 |
+
diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
|
220 |
+
index 0424ebb..b019269 100644
|
221 |
+
--- a/OgreMain/CMakeLists.txt
|
222 |
+
+++ b/OgreMain/CMakeLists.txt
|
223 |
+
@@ -434,8 +434,6 @@ if (APPLE)
|
224 |
+
set_target_properties(OgreMain PROPERTIES
|
225 |
+
LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
|
226 |
+
)
|
227 |
+
-
|
228 |
+
- set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
|
229 |
+
|
230 |
+
add_custom_command(TARGET OgreMain POST_BUILD
|
231 |
+
COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre-next/vcpkg.json
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "ogre-next",
|
3 |
+
"version": "2.3.0",
|
4 |
+
"description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++",
|
5 |
+
"homepage": "https://github.com/OGRECave/ogre-next",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-date-time",
|
9 |
+
"boost-thread",
|
10 |
+
"freeimage",
|
11 |
+
"freetype",
|
12 |
+
"openvr",
|
13 |
+
"poco",
|
14 |
+
"rapidjson",
|
15 |
+
"sdl2",
|
16 |
+
"tbb",
|
17 |
+
"tinyxml",
|
18 |
+
{
|
19 |
+
"name": "vcpkg-cmake",
|
20 |
+
"host": true
|
21 |
+
},
|
22 |
+
{
|
23 |
+
"name": "vcpkg-cmake-config",
|
24 |
+
"host": true
|
25 |
+
},
|
26 |
+
"zlib",
|
27 |
+
"zziplib"
|
28 |
+
],
|
29 |
+
"features": {
|
30 |
+
"csharp": {
|
31 |
+
"description": "Build csharp bindings"
|
32 |
+
},
|
33 |
+
"d3d9": {
|
34 |
+
"description": "Build Direct3D9 RenderSystem"
|
35 |
+
},
|
36 |
+
"java": {
|
37 |
+
"description": "Build Java (JNI) bindings"
|
38 |
+
},
|
39 |
+
"python": {
|
40 |
+
"description": "Build Python bindings",
|
41 |
+
"dependencies": [
|
42 |
+
"python3"
|
43 |
+
]
|
44 |
+
}
|
45 |
+
}
|
46 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/fix-dependency.patch
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
|
2 |
+
index 2ae0b66..e6c55cd 100644
|
3 |
+
--- a/CMake/Dependencies.cmake
|
4 |
+
+++ b/CMake/Dependencies.cmake
|
5 |
+
@@ -242,7 +242,7 @@ find_package(FreeImage)
|
6 |
+
macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "")
|
7 |
+
|
8 |
+
# Find FreeType
|
9 |
+
-find_package(Freetype)
|
10 |
+
+find_package(freetype CONFIG REQUIRED)
|
11 |
+
macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "")
|
12 |
+
|
13 |
+
# Find X11
|
14 |
+
@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET)
|
15 |
+
macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "")
|
16 |
+
|
17 |
+
# pugixml
|
18 |
+
-find_package(pugixml QUIET)
|
19 |
+
+find_package(pugixml CONFIG REQUIRED)
|
20 |
+
macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "")
|
21 |
+
|
22 |
+
# Assimp
|
23 |
+
-find_package(ASSIMP QUIET)
|
24 |
+
+find_package(assimp CONFIG REQUIRED)
|
25 |
+
macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "")
|
26 |
+
|
27 |
+
if(ASSIMP_FOUND)
|
28 |
+
@@ -336,7 +336,7 @@ endif()
|
29 |
+
# Find sdl2
|
30 |
+
if(NOT ANDROID AND NOT EMSCRIPTEN)
|
31 |
+
# find script does not work in cross compilation environment
|
32 |
+
- find_package(SDL2 QUIET)
|
33 |
+
+ find_package(SDL2 CONFIG REQUIRED)
|
34 |
+
macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "")
|
35 |
+
if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
|
36 |
+
add_library(SDL2::SDL2 INTERFACE IMPORTED)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/fix-findimgui.patch
ADDED
@@ -0,0 +1,65 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
|
2 |
+
index df8f32af4..42be1e8f2 100644
|
3 |
+
--- a/Components/Overlay/CMakeLists.txt
|
4 |
+
+++ b/Components/Overlay/CMakeLists.txt
|
5 |
+
@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES
|
6 |
+
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
|
7 |
+
|
8 |
+
if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
9 |
+
- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "")
|
10 |
+
- if(NOT EXISTS ${IMGUI_DIR})
|
11 |
+
- message(STATUS "Dowloading imgui")
|
12 |
+
- file(DOWNLOAD
|
13 |
+
- https://github.com/ocornut/imgui/archive/v1.77.tar.gz
|
14 |
+
- ${PROJECT_BINARY_DIR}/imgui.tar.gz)
|
15 |
+
- execute_process(COMMAND ${CMAKE_COMMAND}
|
16 |
+
- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
|
17 |
+
- endif()
|
18 |
+
- list(APPEND SOURCE_FILES
|
19 |
+
- ${IMGUI_DIR}/imgui.cpp
|
20 |
+
- ${IMGUI_DIR}/imgui_draw.cpp
|
21 |
+
- ${IMGUI_DIR}/imgui_widgets.cpp
|
22 |
+
- ${IMGUI_DIR}/imgui_demo.cpp
|
23 |
+
- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp)
|
24 |
+
+ find_package(imgui CONFIG REQUIRED)
|
25 |
+
+ find_path(IMGUI_INCLUDE_DIR imgui.h)
|
26 |
+
else()
|
27 |
+
list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp")
|
28 |
+
endif()
|
29 |
+
@@ -41,13 +28,17 @@ endif()
|
30 |
+
# setup target
|
31 |
+
add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
|
32 |
+
set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
|
33 |
+
-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB)
|
34 |
+
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
35 |
+
+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui)
|
36 |
+
+else()
|
37 |
+
+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB)
|
38 |
+
+endif()
|
39 |
+
target_include_directories(OgreOverlay PUBLIC
|
40 |
+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
41 |
+
$<INSTALL_INTERFACE:include/OGRE/Overlay>
|
42 |
+
PRIVATE ${FREETYPE_INCLUDE_DIRS})
|
43 |
+
|
44 |
+
-if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
45 |
+
+if(0)
|
46 |
+
target_include_directories(OgreOverlay PUBLIC
|
47 |
+
PUBLIC "$<BUILD_INTERFACE:${IMGUI_DIR}>"
|
48 |
+
PRIVATE "$<BUILD_INTERFACE:${IMGUI_DIR}/misc/freetype>")
|
49 |
+
diff --git "a/Components/Bites/CMakeLists.txt" "b/Components/Bites/CMakeLists.txt"
|
50 |
+
index 5d58a8d74..fe41e4a28 100644
|
51 |
+
--- "a/Components/Bites/CMakeLists.txt"
|
52 |
+
+++ "b/Components/Bites/CMakeLists.txt"
|
53 |
+
@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN)
|
54 |
+
message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites")
|
55 |
+
endif()
|
56 |
+
|
57 |
+
+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
|
58 |
+
+ find_package(imgui CONFIG REQUIRED)
|
59 |
+
+ target_link_libraries(OgreBites PRIVATE imgui::imgui)
|
60 |
+
+endif()
|
61 |
+
+
|
62 |
+
generate_export_header(OgreBites
|
63 |
+
EXPORT_MACRO_NAME _OgreBitesExport
|
64 |
+
EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h)
|
65 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/portfile.cmake
ADDED
@@ -0,0 +1,132 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt")
|
2 |
+
message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.")
|
3 |
+
endif()
|
4 |
+
|
5 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
6 |
+
message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
vcpkg_from_github(
|
10 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
11 |
+
REPO OGRECave/ogre
|
12 |
+
REF 7d0c8181ac43ad20bdba326abbd3deeddf310f0b #v1.12.9
|
13 |
+
SHA512 f223075f49a2465cd5070f5efa796aa715f3ea2fefd578e4ec0a11be2fd3330922849ed804e1df004209abafaa7b24ff42432dd79f336a56063e3cf38ae0e8c9
|
14 |
+
HEAD_REF master
|
15 |
+
PATCHES
|
16 |
+
toolchain_fixes.patch
|
17 |
+
fix-dependency.patch
|
18 |
+
fix-findimgui.patch
|
19 |
+
disable-dependency-qt.patch
|
20 |
+
)
|
21 |
+
|
22 |
+
file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake")
|
23 |
+
|
24 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
25 |
+
set(OGRE_STATIC ON)
|
26 |
+
else()
|
27 |
+
set(OGRE_STATIC OFF)
|
28 |
+
endif()
|
29 |
+
|
30 |
+
# Configure features
|
31 |
+
|
32 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
33 |
+
FEATURES
|
34 |
+
d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9
|
35 |
+
java OGRE_BUILD_COMPONENT_JAVA
|
36 |
+
python OGRE_BUILD_COMPONENT_PYTHON
|
37 |
+
csharp OGRE_BUILD_COMPONENT_CSHARP
|
38 |
+
overlay OGRE_BUILD_COMPONENT_OVERLAY
|
39 |
+
zziplib OGRE_CONFIG_ENABLE_ZIP
|
40 |
+
strict OGRE_RESOURCEMANAGER_STRICT
|
41 |
+
)
|
42 |
+
|
43 |
+
# OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources
|
44 |
+
string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=ON" "OGRE_RESOURCEMANAGER_STRICT=1" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
|
45 |
+
string(REPLACE "OGRE_RESOURCEMANAGER_STRICT=OFF" "OGRE_RESOURCEMANAGER_STRICT=0" FEATURE_OPTIONS "${FEATURE_OPTIONS}")
|
46 |
+
|
47 |
+
vcpkg_cmake_configure(
|
48 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
49 |
+
OPTIONS
|
50 |
+
${FEATURE_OPTIONS}
|
51 |
+
-DOGRE_BUILD_DEPENDENCIES=OFF
|
52 |
+
-DOGRE_BUILD_SAMPLES=OFF
|
53 |
+
-DOGRE_BUILD_TESTS=OFF
|
54 |
+
-DOGRE_BUILD_TOOLS=OFF
|
55 |
+
-DOGRE_BUILD_MSVC_MP=ON
|
56 |
+
-DOGRE_BUILD_MSVC_ZM=ON
|
57 |
+
-DOGRE_INSTALL_DEPENDENCIES=OFF
|
58 |
+
-DOGRE_INSTALL_DOCS=OFF
|
59 |
+
-DOGRE_INSTALL_PDB=OFF
|
60 |
+
-DOGRE_INSTALL_SAMPLES=OFF
|
61 |
+
-DOGRE_INSTALL_TOOLS=OFF
|
62 |
+
-DOGRE_INSTALL_CMAKE=ON
|
63 |
+
-DOGRE_INSTALL_VSPROPS=OFF
|
64 |
+
-DOGRE_STATIC=${OGRE_STATIC}
|
65 |
+
-DOGRE_CONFIG_THREAD_PROVIDER=std
|
66 |
+
-DOGRE_BUILD_RENDERSYSTEM_D3D11=ON
|
67 |
+
-DOGRE_BUILD_RENDERSYSTEM_GL=ON
|
68 |
+
-DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON
|
69 |
+
-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
|
70 |
+
-DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF
|
71 |
+
-DFREETYPE_FOUND=ON
|
72 |
+
-DOGRE_CMAKE_DIR=share/ogre
|
73 |
+
)
|
74 |
+
|
75 |
+
vcpkg_cmake_install()
|
76 |
+
vcpkg_cmake_config_fixup()
|
77 |
+
|
78 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
79 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
80 |
+
|
81 |
+
file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg)
|
82 |
+
if(REL_CFGS)
|
83 |
+
file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
84 |
+
file(REMOVE ${REL_CFGS})
|
85 |
+
endif()
|
86 |
+
|
87 |
+
file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg)
|
88 |
+
if(DBG_CFGS)
|
89 |
+
file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
90 |
+
file(REMOVE ${DBG_CFGS})
|
91 |
+
endif()
|
92 |
+
|
93 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
94 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
95 |
+
endif()
|
96 |
+
|
97 |
+
#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol
|
98 |
+
#manual-link subfolder is here to the rescue!
|
99 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
100 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
101 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
102 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib)
|
103 |
+
else()
|
104 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib)
|
105 |
+
endif()
|
106 |
+
if(NOT VCPKG_BUILD_TYPE)
|
107 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
108 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
109 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib)
|
110 |
+
else()
|
111 |
+
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib)
|
112 |
+
endif()
|
113 |
+
endif()
|
114 |
+
|
115 |
+
file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre/*.cmake)
|
116 |
+
foreach(SHARE_FILE ${SHARE_FILES})
|
117 |
+
file(READ "${SHARE_FILE}" _contents)
|
118 |
+
string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}")
|
119 |
+
file(WRITE "${SHARE_FILE}" "${_contents}")
|
120 |
+
endforeach()
|
121 |
+
endif()
|
122 |
+
|
123 |
+
file(GLOB share_cfgs ${CURRENT_PACKAGES_DIR}/share/OGRE/*.cfg)
|
124 |
+
foreach(file ${share_cfgs})
|
125 |
+
vcpkg_replace_string("${file}" "${CURRENT_PACKAGES_DIR}" "../..")
|
126 |
+
endforeach()
|
127 |
+
|
128 |
+
# Handle copyright
|
129 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
130 |
+
|
131 |
+
vcpkg_copy_pdbs()
|
132 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/toolchain_fixes.patch
ADDED
@@ -0,0 +1,265 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
2 |
+
index a7a3796..2e21403 100644
|
3 |
+
--- a/CMake/CMakeLists.txt
|
4 |
+
+++ b/CMake/CMakeLists.txt
|
5 |
+
@@ -13,10 +13,12 @@
|
6 |
+
# directory, but can also be used for custom projects.
|
7 |
+
#############################################################
|
8 |
+
|
9 |
+
-if(WIN32 OR APPLE)
|
10 |
+
- set(OGRE_CMAKE_DIR "CMake")
|
11 |
+
-else()
|
12 |
+
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
13 |
+
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
14 |
+
+ if(WIN32 OR APPLE)
|
15 |
+
+ set(OGRE_CMAKE_DIR "CMake")
|
16 |
+
+ else()
|
17 |
+
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
18 |
+
+ endif()
|
19 |
+
endif()
|
20 |
+
|
21 |
+
set(INST_FILES Utils/FindPkgMacros.cmake)
|
22 |
+
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
|
23 |
+
index 06a055b..09d10bd 100644
|
24 |
+
--- a/CMake/InstallResources.cmake
|
25 |
+
+++ b/CMake/InstallResources.cmake
|
26 |
+
@@ -204,10 +204,12 @@ endif ()
|
27 |
+
# Create the CMake package files
|
28 |
+
include(CMakePackageConfigHelpers)
|
29 |
+
|
30 |
+
-if(WIN32 OR APPLE)
|
31 |
+
- set(OGRE_CMAKE_DIR "CMake")
|
32 |
+
-else()
|
33 |
+
- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
34 |
+
+if(NOT DEFINED OGRE_CMAKE_DIR)
|
35 |
+
+ if(WIN32 OR APPLE)
|
36 |
+
+ set(OGRE_CMAKE_DIR "CMake")
|
37 |
+
+ else()
|
38 |
+
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
|
39 |
+
+ endif()
|
40 |
+
endif()
|
41 |
+
if(WIN32)
|
42 |
+
set(OGRE_PLUGIN_DIR_CMAKE "bin")
|
43 |
+
diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake
|
44 |
+
index 4501cf9..7eb57c3 100644
|
45 |
+
--- a/CMake/Packages/FindCg.cmake
|
46 |
+
+++ b/CMake/Packages/FindCg.cmake
|
47 |
+
@@ -56,7 +56,7 @@ endif()
|
48 |
+
|
49 |
+
find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
50 |
+
find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
51 |
+
-make_library_set(Cg_LIBRARY)
|
52 |
+
+make_library_set(Cg)
|
53 |
+
|
54 |
+
if (WIN32)
|
55 |
+
if (CMAKE_CL_64)
|
56 |
+
diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
|
57 |
+
index 7c89ec5..d8314f0 100644
|
58 |
+
--- a/CMake/Packages/FindFreeImage.cmake
|
59 |
+
+++ b/CMake/Packages/FindFreeImage.cmake
|
60 |
+
@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
|
61 |
+
find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
62 |
+
find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
63 |
+
|
64 |
+
-make_library_set(FreeImage_LIBRARY)
|
65 |
+
+make_library_set(FreeImage)
|
66 |
+
|
67 |
+
findpkg_finish(FreeImage)
|
68 |
+
|
69 |
+
diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
|
70 |
+
index dd4b179..6f158fc 100644
|
71 |
+
--- a/CMake/Packages/FindGLSLOptimizer.cmake
|
72 |
+
+++ b/CMake/Packages/FindGLSLOptimizer.cmake
|
73 |
+
@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
|
74 |
+
find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
|
75 |
+
find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
76 |
+
find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
77 |
+
-make_library_set(GLSL_Optimizer_LIBRARY)
|
78 |
+
+make_library_set(GLSL_Optimizer)
|
79 |
+
|
80 |
+
findpkg_finish(GLSL_Optimizer)
|
81 |
+
add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
|
82 |
+
diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
|
83 |
+
index 7125895..13a306f 100644
|
84 |
+
--- a/CMake/Packages/FindHLSL2GLSL.cmake
|
85 |
+
+++ b/CMake/Packages/FindHLSL2GLSL.cmake
|
86 |
+
@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
|
87 |
+
find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
|
88 |
+
find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
89 |
+
find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
90 |
+
-make_library_set(HLSL2GLSL_LIBRARY)
|
91 |
+
+make_library_set(HLSL2GLSL)
|
92 |
+
|
93 |
+
findpkg_finish(HLSL2GLSL)
|
94 |
+
add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
|
95 |
+
diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
|
96 |
+
index 95c70cd..893ce01 100644
|
97 |
+
--- a/CMake/Packages/FindNVAPI.cmake
|
98 |
+
+++ b/CMake/Packages/FindNVAPI.cmake
|
99 |
+
@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
|
100 |
+
find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
|
101 |
+
find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
|
102 |
+
find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
|
103 |
+
-make_library_set(NVAPI_LIBRARY)
|
104 |
+
+make_library_set(NVAPI)
|
105 |
+
|
106 |
+
findpkg_finish(NVAPI)
|
107 |
+
add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
|
108 |
+
|
109 |
+
diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
|
110 |
+
index 6b6d7fa..3667b8b 100644
|
111 |
+
--- a/CMake/Packages/FindPOCO.cmake
|
112 |
+
+++ b/CMake/Packages/FindPOCO.cmake
|
113 |
+
@@ -50,7 +50,7 @@ findpkg_framework(POCO)
|
114 |
+
find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
|
115 |
+
find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
116 |
+
find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
117 |
+
-make_library_set(POCO_LIBRARY)
|
118 |
+
+make_library_set(POCO)
|
119 |
+
|
120 |
+
findpkg_finish(POCO)
|
121 |
+
|
122 |
+
@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES)
|
123 |
+
find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
|
124 |
+
find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
125 |
+
find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
126 |
+
-make_library_set(POCO_Util_LIBRARY)
|
127 |
+
+make_library_set(POCO_Util)
|
128 |
+
findpkg_finish(POCO_Util)
|
129 |
+
|
130 |
+
# Look for Poco's Net package
|
131 |
+
@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES)
|
132 |
+
find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
|
133 |
+
find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
134 |
+
find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
135 |
+
-make_library_set(POCO_Net_LIBRARY)
|
136 |
+
+make_library_set(POCO_Net)
|
137 |
+
findpkg_finish(POCO_Net)
|
138 |
+
|
139 |
+
# Look for Poco's NetSSL package
|
140 |
+
@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
|
141 |
+
find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
|
142 |
+
find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
143 |
+
find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
144 |
+
-make_library_set(POCO_NetSSL_LIBRARY)
|
145 |
+
+make_library_set(POCO_NetSSL)
|
146 |
+
findpkg_finish(POCO_NetSSL)
|
147 |
+
|
148 |
+
# Look for Poco's XML package
|
149 |
+
@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
|
150 |
+
find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
|
151 |
+
find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
152 |
+
find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
|
153 |
+
-make_library_set(POCO_XML_LIBRARY)
|
154 |
+
+make_library_set(POCO_XML)
|
155 |
+
findpkg_finish(POCO_XML)
|
156 |
+
|
157 |
+
diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
|
158 |
+
index 0c48510..c121966 100644
|
159 |
+
--- a/CMake/Packages/FindTBB.cmake
|
160 |
+
+++ b/CMake/Packages/FindTBB.cmake
|
161 |
+
@@ -104,7 +104,7 @@ findpkg_framework(TBB)
|
162 |
+
find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
163 |
+
find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
164 |
+
find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
165 |
+
-make_library_set(TBB_LIBRARY)
|
166 |
+
+make_library_set(TBB)
|
167 |
+
|
168 |
+
findpkg_finish(TBB)
|
169 |
+
|
170 |
+
@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
|
171 |
+
find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} )
|
172 |
+
find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
173 |
+
find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} )
|
174 |
+
-make_library_set(TBB_MALLOC_LIBRARY)
|
175 |
+
+make_library_set(TBB_MALLOC)
|
176 |
+
findpkg_finish(TBB_MALLOC)
|
177 |
+
|
178 |
+
# Look for TBB's malloc proxy package
|
179 |
+
@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
|
180 |
+
find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
|
181 |
+
find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
182 |
+
find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
|
183 |
+
-make_library_set(TBB_MALLOC_PROXY_LIBRARY)
|
184 |
+
+make_library_set(TBB_MALLOC_PROXY)
|
185 |
+
findpkg_finish(TBB_MALLOC_PROXY)
|
186 |
+
diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake
|
187 |
+
index e97951e..54c2567 100644
|
188 |
+
--- a/CMake/Packages/FindZZip.cmake
|
189 |
+
+++ b/CMake/Packages/FindZZip.cmake
|
190 |
+
@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib)
|
191 |
+
|
192 |
+
findpkg_framework(ZZip)
|
193 |
+
|
194 |
+
-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
195 |
+
+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS})
|
196 |
+
|
197 |
+
find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
|
198 |
+
find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
|
199 |
+
|
200 |
+
-make_library_set(ZZip_LIBRARY)
|
201 |
+
+make_library_set(ZZip)
|
202 |
+
|
203 |
+
findpkg_finish(ZZip)
|
204 |
+
|
205 |
+
diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
|
206 |
+
index 374f84b..dc7066d 100644
|
207 |
+
--- a/CMake/Utils/FindPkgMacros.cmake
|
208 |
+
+++ b/CMake/Utils/FindPkgMacros.cmake
|
209 |
+
@@ -79,15 +79,21 @@ endmacro (use_pkgconfig)
|
210 |
+
|
211 |
+
# Couple a set of release AND debug libraries (or frameworks)
|
212 |
+
macro(make_library_set PREFIX)
|
213 |
+
- if (${PREFIX}_FWK)
|
214 |
+
- set(${PREFIX} ${${PREFIX}_FWK})
|
215 |
+
- elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
|
216 |
+
- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
|
217 |
+
- elseif (${PREFIX}_REL)
|
218 |
+
- set(${PREFIX} ${${PREFIX}_REL})
|
219 |
+
- elseif (${PREFIX}_DBG)
|
220 |
+
- set(${PREFIX} ${${PREFIX}_DBG})
|
221 |
+
- endif ()
|
222 |
+
+ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
|
223 |
+
+ set(PREFIX_LIB "${PREFIX}_LIBRARY")
|
224 |
+
+ if (${PREFIX_LIB}_FWK)
|
225 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK})
|
226 |
+
+ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG)
|
227 |
+
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "")
|
228 |
+
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "")
|
229 |
+
+ select_library_configurations(${PREFIX})
|
230 |
+
+ elseif (${PREFIX_LIB}_REL)
|
231 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL})
|
232 |
+
+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL})
|
233 |
+
+ elseif (${PREFIX_LIB}_DBG)
|
234 |
+
+ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG})
|
235 |
+
+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG})
|
236 |
+
+ endif()
|
237 |
+
endmacro(make_library_set)
|
238 |
+
|
239 |
+
# Generate debug names from given release names
|
240 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
241 |
+
index 1602572..9fddbe7 100644
|
242 |
+
--- a/CMakeLists.txt
|
243 |
+
+++ b/CMakeLists.txt
|
244 |
+
@@ -271,7 +271,7 @@ elseif(EMSCRIPTEN)
|
245 |
+
elseif (APPLE AND NOT APPLE_IOS)
|
246 |
+
|
247 |
+
set(XCODE_ATTRIBUTE_SDKROOT macosx)
|
248 |
+
- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
|
249 |
+
+ if(1)
|
250 |
+
execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
|
251 |
+
string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
|
252 |
+
else()
|
253 |
+
diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt
|
254 |
+
index e9c936a..bb8747e 100644
|
255 |
+
--- a/PlugIns/EXRCodec/CMakeLists.txt
|
256 |
+
+++ b/PlugIns/EXRCodec/CMakeLists.txt
|
257 |
+
@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES})
|
258 |
+
target_include_directories(Codec_EXR PUBLIC
|
259 |
+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
260 |
+
$<INSTALL_INTERFACE:include/OGRE/Plugins/EXRCodec>)
|
261 |
+
-target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR")
|
262 |
+
+target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}")
|
263 |
+
|
264 |
+
ogre_config_framework(Codec_EXR)
|
265 |
+
ogre_config_plugin(Codec_EXR)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ogre/vcpkg.json
ADDED
@@ -0,0 +1,77 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "ogre",
|
3 |
+
"version": "1.12.9",
|
4 |
+
"port-version": 7,
|
5 |
+
"description": "3D Object-Oriented Graphics Rendering Engine",
|
6 |
+
"homepage": "https://github.com/OGRECave/ogre",
|
7 |
+
"license": "MIT",
|
8 |
+
"dependencies": [
|
9 |
+
"pugixml",
|
10 |
+
"sdl2",
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake-config",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
"zlib"
|
20 |
+
],
|
21 |
+
"default-features": [
|
22 |
+
"assimp",
|
23 |
+
"freeimage",
|
24 |
+
"overlay",
|
25 |
+
"zziplib"
|
26 |
+
],
|
27 |
+
"features": {
|
28 |
+
"assimp": {
|
29 |
+
"description": "Use assimp",
|
30 |
+
"dependencies": [
|
31 |
+
"assimp"
|
32 |
+
]
|
33 |
+
},
|
34 |
+
"csharp": {
|
35 |
+
"description": "Build csharp bindings"
|
36 |
+
},
|
37 |
+
"d3d9": {
|
38 |
+
"description": "Build Direct3D9 RenderSystem"
|
39 |
+
},
|
40 |
+
"freeimage": {
|
41 |
+
"description": "Build with FreeImage support",
|
42 |
+
"dependencies": [
|
43 |
+
"freeimage"
|
44 |
+
]
|
45 |
+
},
|
46 |
+
"java": {
|
47 |
+
"description": "Build Java (JNI) bindings"
|
48 |
+
},
|
49 |
+
"overlay": {
|
50 |
+
"description": "Build overlay component",
|
51 |
+
"dependencies": [
|
52 |
+
"freetype",
|
53 |
+
{
|
54 |
+
"name": "imgui",
|
55 |
+
"features": [
|
56 |
+
"freetype"
|
57 |
+
]
|
58 |
+
}
|
59 |
+
]
|
60 |
+
},
|
61 |
+
"python": {
|
62 |
+
"description": "Build Python bindings",
|
63 |
+
"dependencies": [
|
64 |
+
"python3"
|
65 |
+
]
|
66 |
+
},
|
67 |
+
"strict": {
|
68 |
+
"description": "Force Ogre resource manager to be strict with group names and resource names"
|
69 |
+
},
|
70 |
+
"zziplib": {
|
71 |
+
"description": "Build with zziplib support (GPL)",
|
72 |
+
"dependencies": [
|
73 |
+
"zziplib"
|
74 |
+
]
|
75 |
+
}
|
76 |
+
}
|
77 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/0001_install_pkgconfig_win32.patch
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
--- a/CMakeLists.txt 2021-05-14 03:09:42.000000000 +0800
|
3 |
+
+++ b/CMakeLists.txt 2022-03-08 12:48:17.012589000 +0800
|
4 |
+
@@ -255,7 +255,12 @@
|
5 |
+
install(FILES $<TARGET_PDB_FILE:OIS> DESTINATION bin OPTIONAL)
|
6 |
+
endif(MSVC AND BUILD_SHARED_LIBS)
|
7 |
+
|
8 |
+
-if(UNIX)
|
9 |
+
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY)
|
10 |
+
- install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig)
|
11 |
+
+if (CMAKE_DEBUG_POSTFIX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
|
12 |
+
+ set(OIS_POSTFIX ${CMAKE_DEBUG_POSTFIX})
|
13 |
+
+else()
|
14 |
+
+ set(OIS_POSTFIX "")
|
15 |
+
endif()
|
16 |
+
+
|
17 |
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OIS.pc.in ${CMAKE_BINARY_DIR}/OIS.pc @ONLY)
|
18 |
+
+install(FILES ${CMAKE_BINARY_DIR}/OIS.pc DESTINATION ${OIS_LIB_DIRECTORY}/pkgconfig)
|
19 |
+
+
|
20 |
+
diff -Naur a/OIS.pc.in b/OIS.pc.in
|
21 |
+
--- a/OIS.pc.in 2021-05-14 03:09:42.000000000 +0800
|
22 |
+
+++ b/OIS.pc.in 2022-03-08 12:48:33.599696300 +0800
|
23 |
+
@@ -6,5 +6,5 @@
|
24 |
+
Name: OIS
|
25 |
+
Description: Cross platform C++ Input Framework
|
26 |
+
Version: @OIS_VERSION@
|
27 |
+
-Libs: -L${libdir} -lOIS
|
28 |
+
+Libs: -L${libdir} -lOIS@OIS_POSTFIX@
|
29 |
+
Cflags: -I${includedir} -I${includedir}/ois
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/portfile.cmake
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO wgois/OIS
|
4 |
+
REF v1.5.1
|
5 |
+
SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
0001_install_pkgconfig_win32.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
DISABLE_PARALLEL_CONFIGURE
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_cmake_install()
|
17 |
+
|
18 |
+
vcpkg_fixup_pkgconfig()
|
19 |
+
|
20 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
21 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
22 |
+
endif()
|
23 |
+
|
24 |
+
# Include files should not be duplicated into the /debug/include directory
|
25 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
26 |
+
|
27 |
+
# Handle copyright
|
28 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ois/vcpkg.json
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "ois",
|
3 |
+
"version": "1.5.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.",
|
6 |
+
"homepage": "https://wgois.github.io/OIS/",
|
7 |
+
"license": "Zlib",
|
8 |
+
"supports": "!(arm | arm64 | uwp)",
|
9 |
+
"dependencies": [
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
}
|
14 |
+
]
|
15 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/0001_Export_targets.patch
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index a9bb05f..31fab8c 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -215,6 +215,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omplConfig.cmake
|
6 |
+
${CMAKE_CURRENT_BINARY_DIR}/omplConfigVersion.cmake
|
7 |
+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ompl/cmake
|
8 |
+
COMPONENT ompl)
|
9 |
+
+install(EXPORT ompl
|
10 |
+
+ DESTINATION "share/ompl"
|
11 |
+
+ FILE ompl-targets.cmake
|
12 |
+
+)
|
13 |
+
|
14 |
+
# script to install ompl on Ubuntu
|
15 |
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install-ompl-ubuntu.sh.in"
|
16 |
+
diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt
|
17 |
+
index 9ea130e..6dda4df 100644
|
18 |
+
--- a/src/ompl/CMakeLists.txt
|
19 |
+
+++ b/src/ompl/CMakeLists.txt
|
20 |
+
@@ -83,6 +83,7 @@ endif (MSVC)
|
21 |
+
|
22 |
+
# install the library
|
23 |
+
install(TARGETS ompl
|
24 |
+
+ EXPORT ompl
|
25 |
+
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
26 |
+
COMPONENT ompl)
|
27 |
+
if (NOT MSVC)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/0002_Fix_config.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in
|
2 |
+
index 465de25d..d1e91929 100644
|
3 |
+
--- a/omplConfig.cmake.in
|
4 |
+
+++ b/omplConfig.cmake.in
|
5 |
+
@@ -18,8 +18,11 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@)
|
6 |
+
set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@)
|
7 |
+
set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@)
|
8 |
+
|
9 |
+
+include(CMakeFindDependencyMacro)
|
10 |
+
+find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options)
|
11 |
+
+find_dependency(Eigen3)
|
12 |
+
set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
13 |
+
-set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};@Boost_INCLUDE_DIR@;@EIGEN3_INCLUDE_DIR@")
|
14 |
+
+set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};${Boost_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR}")
|
15 |
+
foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@)
|
16 |
+
if(_dir)
|
17 |
+
list(APPEND OMPL_INCLUDE_DIRS "${_dir}")
|
18 |
+
@@ -29,7 +32,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS)
|
19 |
+
set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies")
|
20 |
+
|
21 |
+
set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@)
|
22 |
+
-set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};@Boost_LIBRARY_DIRS@")
|
23 |
+
+set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};${Boost_LIBRARY_DIRS}")
|
24 |
+
foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@)
|
25 |
+
if(_dir)
|
26 |
+
list(APPEND OMPL_LIBRARY_DIRS "${_dir}")
|
27 |
+
@@ -40,7 +43,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL
|
28 |
+
|
29 |
+
find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl
|
30 |
+
PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH)
|
31 |
+
-foreach(_lib @Boost_SERIALIZATION_LIBRARY@;@Boost_FILESYSTEM_LIBRARY@;@Boost_SYSTEM_LIBRARY@;@ODE_LIBRARIES@;@SPOT_LIBRARIES@)
|
32 |
+
+foreach(_lib ${Boost_SERIALIZATION_LIBRARY};${Boost_FILESYSTEM_LIBRARY};${Boost_SYSTEM_LIBRARY};@ODE_LIBRARIES@;@SPOT_LIBRARIES@)
|
33 |
+
if(_lib)
|
34 |
+
list(APPEND OMPL_LIBRARIES "${_lib}")
|
35 |
+
endif()
|
36 |
+
@@ -61,3 +64,4 @@ endif()
|
37 |
+
|
38 |
+
include(FindPackageHandleStandardArgs)
|
39 |
+
find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES)
|
40 |
+
+include(${CMAKE_CURRENT_LIST_DIR}/ompl-targets.cmake)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/portfile.cmake
ADDED
@@ -0,0 +1,59 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_buildpath_length_warning(37)
|
2 |
+
|
3 |
+
# See https://github.com/ompl/ompl/blob/main/src/ompl/CMakeLists.txt#L49-L54
|
4 |
+
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
5 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
6 |
+
else()
|
7 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
8 |
+
endif()
|
9 |
+
|
10 |
+
set(OMPL_VERSION 1.5.1)
|
11 |
+
|
12 |
+
vcpkg_from_github(
|
13 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
14 |
+
REPO ompl/ompl
|
15 |
+
REF 1.5.1
|
16 |
+
SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570
|
17 |
+
HEAD_REF master
|
18 |
+
PATCHES
|
19 |
+
0001_Export_targets.patch
|
20 |
+
0002_Fix_config.patch
|
21 |
+
)
|
22 |
+
|
23 |
+
# Based on selected features different files get downloaded, so use the following command instead of patch.
|
24 |
+
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)")
|
25 |
+
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)")
|
26 |
+
|
27 |
+
vcpkg_cmake_configure(
|
28 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
29 |
+
DISABLE_PARALLEL_CONFIGURE
|
30 |
+
OPTIONS
|
31 |
+
-DOMPL_VERSIONED_INSTALL=OFF
|
32 |
+
-DOMPL_REGISTRATION=OFF
|
33 |
+
-DOMPL_BUILD_DEMOS=OFF
|
34 |
+
-DOMPL_BUILD_TESTS=OFF
|
35 |
+
-DOMPL_BUILD_PYBINDINGS=OFF
|
36 |
+
-DOMPL_BUILD_PYTESTS=OFF
|
37 |
+
)
|
38 |
+
|
39 |
+
vcpkg_cmake_install()
|
40 |
+
|
41 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake)
|
42 |
+
vcpkg_fixup_pkgconfig()
|
43 |
+
|
44 |
+
# Remove debug distribution and other, move ompl_benchmark to tools/ dir
|
45 |
+
file(REMOVE_RECURSE
|
46 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
47 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
48 |
+
"${CURRENT_PACKAGES_DIR}/share/man"
|
49 |
+
"${CURRENT_PACKAGES_DIR}/share/ompl/demos"
|
50 |
+
"${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf"
|
51 |
+
"${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena"
|
52 |
+
)
|
53 |
+
|
54 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
55 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
56 |
+
endif()
|
57 |
+
|
58 |
+
# Handle copyright
|
59 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/ompl/vcpkg.json
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "ompl",
|
3 |
+
"version": "1.5.1",
|
4 |
+
"port-version": 5,
|
5 |
+
"description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
|
6 |
+
"homepage": "https://ompl.kavrakilab.org/",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-dynamic-bitset",
|
9 |
+
"boost-filesystem",
|
10 |
+
"boost-graph",
|
11 |
+
"boost-odeint",
|
12 |
+
"boost-program-options",
|
13 |
+
"boost-serialization",
|
14 |
+
"boost-system",
|
15 |
+
"boost-test",
|
16 |
+
"boost-timer",
|
17 |
+
"boost-ublas",
|
18 |
+
"eigen3",
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake",
|
21 |
+
"host": true
|
22 |
+
},
|
23 |
+
{
|
24 |
+
"name": "vcpkg-cmake-config",
|
25 |
+
"host": true
|
26 |
+
}
|
27 |
+
]
|
28 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/fix_boost_static_link.patch
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 4b391b5..24d2c66 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -36,10 +36,10 @@ set(OMPL_DEMO_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/ompl/demos"
|
6 |
+
set(OMPL_CMAKE_UTIL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ompl/CMakeModules"
|
7 |
+
CACHE FILEPATH "Path to directory with auxiliary CMake scripts for OMPL")
|
8 |
+
|
9 |
+
-if(MSVC)
|
10 |
+
+if(false)
|
11 |
+
add_definitions(-DBOOST_ALL_NO_LIB)
|
12 |
+
add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK)
|
13 |
+
-endif(MSVC)
|
14 |
+
+endif(false)
|
15 |
+
# Ensure dynamic linking with boost unit_test_framework
|
16 |
+
add_definitions(-DBOOST_TEST_DYN_LINK)
|
17 |
+
# Avoid valgrind error due to overflow error, cf. https://bitbucket.org/ompl/ompl/issues/543
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/fix_dependency.patch
ADDED
@@ -0,0 +1,128 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 4c7e690..4b391b5 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -73,12 +73,15 @@ set_package_properties(OpenGL PROPERTIES
|
6 |
+
URL "http://opengl.org"
|
7 |
+
PURPOSE "Used to render graphics in ompl_app.")
|
8 |
+
set(OpenGL_GL_PREFERENCE GLVND)
|
9 |
+
-find_package(OpenGL)
|
10 |
+
+if (OMPLAPP_WITH_OPENGL)
|
11 |
+
+find_package(OpenGL REQUIRED)
|
12 |
+
+endif()
|
13 |
+
set_package_properties(Python PROPERTIES
|
14 |
+
URL "http://python.org"
|
15 |
+
PURPOSE "Used for python bindings.")
|
16 |
+
# This includes our own FindPython.cmake in ompl/CMakeModules. It defines,
|
17 |
+
# among other things, the find_python_module() function used below.
|
18 |
+
+if (OMPLAPP_WITH_PYTHON)
|
19 |
+
find_package(Python)
|
20 |
+
find_boost_python()
|
21 |
+
|
22 |
+
@@ -105,55 +108,76 @@ find_python_module(OpenGL)
|
23 |
+
if (NOT OPENGL_FOUND OR NOT PY_OPENGL)
|
24 |
+
message(WARNING "Both OpenGL and the Python OpenGL module need to be installed to use the GUI")
|
25 |
+
endif()
|
26 |
+
+endif()
|
27 |
+
set_package_properties(Eigen3 PROPERTIES
|
28 |
+
URL "http://eigen.tuxfamily.org"
|
29 |
+
PURPOSE "A linear algebra library used throughout OMPL.")
|
30 |
+
-find_package(Eigen3 REQUIRED)
|
31 |
+
+find_package(Eigen3 CONFIG REQUIRED)
|
32 |
+
set_package_properties(Triangle PROPERTIES
|
33 |
+
URL "http://www.cs.cmu.edu/~quake/triangle.html"
|
34 |
+
PURPOSE "Used to create triangular decompositions of polygonal 2D environments.")
|
35 |
+
+if (OMPLAPP_WITH_TRIANGLE)
|
36 |
+
find_package(Triangle QUIET)
|
37 |
+
+endif()
|
38 |
+
set_package_properties(flann PROPERTIES
|
39 |
+
URL "https://github.com/mariusmuja/flann"
|
40 |
+
PURPOSE "If detetected, FLANN can be used for nearest neighbor queries by OMPL.")
|
41 |
+
+if (OMPLAPP_WITH_FLANN)
|
42 |
+
find_package(flann 1.8.3 QUIET)
|
43 |
+
+endif()
|
44 |
+
set_package_properties(spot PROPERTIES
|
45 |
+
URL "http://spot.lrde.epita.fr"
|
46 |
+
PURPOSE "Used for constructing finite automata from LTL formulae.")
|
47 |
+
+if (OMPLAPP_WITH_SPOT)
|
48 |
+
find_package(spot)
|
49 |
+
+endif()
|
50 |
+
set_package_properties(MORSE PROPERTIES
|
51 |
+
URL "https://www.openrobots.org/wiki/morse"
|
52 |
+
PURPOSE "OMPL includes a plugin for the MORSE Robot Simulation engine.")
|
53 |
+
+if (OMPLAPP_WITH_MORSE)
|
54 |
+
find_package(MORSE QUIET)
|
55 |
+
+endif()
|
56 |
+
set_package_properties(ODE PROPERTIES
|
57 |
+
URL "http://ode.org"
|
58 |
+
PURPOSE "The Open Dynamics Engine can be used as a \"black box\" for kinodynamic planning.")
|
59 |
+
-find_package(ODE QUIET)
|
60 |
+
+if (OMPLAPP_WITH_ODE)
|
61 |
+
+find_package(ODE CONFIG REQUIRED)
|
62 |
+
+set(ODE_LIBRARIES ODE::ODE)
|
63 |
+
+endif()
|
64 |
+
set_package_properties(Drawstuff PROPERTIES
|
65 |
+
URL "http://ode.org"
|
66 |
+
PURPOSE "Part of the ODE source distribution, used in one demo program.")
|
67 |
+
+if (OMPLAPP_WITH_DRAWSTUFF)
|
68 |
+
find_package(Drawstuff QUIET)
|
69 |
+
+endif()
|
70 |
+
set_package_properties(assimp PROPERTIES
|
71 |
+
URL "http://assimp.org"
|
72 |
+
PURPOSE "Used in ompl_app for reading meshes representing robots and environments.")
|
73 |
+
-find_package(assimp REQUIRED)
|
74 |
+
+find_package(assimp CONFIG REQUIRED)
|
75 |
+
+set(ASSIMP_LIBRARIES assimp::assimp)
|
76 |
+
set_package_properties(ccd PROPERTIES
|
77 |
+
URL "https://github.com/danfis/libccd"
|
78 |
+
PURPOSE "Collision detection library used by fcl.")
|
79 |
+
-find_package(ccd REQUIRED)
|
80 |
+
+find_package(ccd CONFIG REQUIRED)
|
81 |
+
set_package_properties(fcl PROPERTIES
|
82 |
+
URL "https://github.com/flexible-collision-library/fcl"
|
83 |
+
PURPOSE "The default collision checking library.")
|
84 |
+
+if (OMPLAPP_WITH_OCTOMAP)
|
85 |
+
find_package(octomap QUIET)
|
86 |
+
+endif()
|
87 |
+
find_package(fcl REQUIRED)
|
88 |
+
set_package_properties(Threads PROPERTIES
|
89 |
+
URL "https://en.wikipedia.org/wiki/POSIX_Threads"
|
90 |
+
PURPOSE "Pthreads is sometimes needed, depending on OS / compiler.")
|
91 |
+
+if (OMPLAPP_WITH_THREADS)
|
92 |
+
find_package(Threads QUIET)
|
93 |
+
+endif()
|
94 |
+
set_package_properties(Doxygen PROPERTIES
|
95 |
+
URL "http://doxygen.org"
|
96 |
+
PURPOSE "Used to create the OMPL documentation (i.e., http://ompl.kavrakilab.org).")
|
97 |
+
+if (OMPLAPP_WITH_DOXYGEN)
|
98 |
+
find_package(Doxygen)
|
99 |
+
+endif()
|
100 |
+
|
101 |
+
enable_testing()
|
102 |
+
|
103 |
+
@@ -177,9 +201,7 @@ include_directories(SYSTEM "${Boost_INCLUDE_DIR}")
|
104 |
+
include_directories(
|
105 |
+
"${OMPLAPP_INCLUDE_DIRS}"
|
106 |
+
"${OMPL_INCLUDE_DIRS}"
|
107 |
+
- "${EIGEN3_INCLUDE_DIR}"
|
108 |
+
- "${FCL_INCLUDE_DIRS}"
|
109 |
+
- "${ASSIMP_INCLUDE_DIRS}")
|
110 |
+
+ "${FCL_INCLUDE_DIRS}")
|
111 |
+
|
112 |
+
# ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was
|
113 |
+
# enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most
|
114 |
+
@@ -242,12 +264,14 @@ endif()
|
115 |
+
set_package_properties(PQP PROPERTIES
|
116 |
+
URL "http://gamma.cs.unc.edu/SSV/"
|
117 |
+
PURPOSE "Used as an alternative, additional collision checking library (the default is FCL).")
|
118 |
+
+IF (OMPLAPP_WITH_PQP)
|
119 |
+
find_package(PQP QUIET)
|
120 |
+
if(PQP_FOUND)
|
121 |
+
include_directories("${PQP_INCLUDE_DIR}")
|
122 |
+
set(OMPLAPP_MODULE_LIBRARIES ${OMPLAPP_MODULE_LIBRARIES} ${PQP_LIBRARY})
|
123 |
+
set(OMPLAPP_LIBRARIES ${OMPLAPP_LIBRARIES} ${PQP_LIBRARY})
|
124 |
+
endif()
|
125 |
+
+endif()
|
126 |
+
|
127 |
+
add_subdirectory(ompl/doc)
|
128 |
+
add_subdirectory(ompl/src)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/portfile.cmake
ADDED
@@ -0,0 +1,89 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_buildpath_length_warning(37)
|
2 |
+
|
3 |
+
set(OMPL_VERSION 1.5.1)
|
4 |
+
|
5 |
+
vcpkg_download_distfile(ARCHIVE
|
6 |
+
URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz"
|
7 |
+
FILENAME "omplapp-${OMPL_VERSION}.tar.gz"
|
8 |
+
SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3
|
9 |
+
)
|
10 |
+
|
11 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
12 |
+
set(STATIC_PATCH fix_boost_static_link.patch)
|
13 |
+
endif()
|
14 |
+
|
15 |
+
vcpkg_extract_source_archive_ex(
|
16 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
17 |
+
ARCHIVE ${ARCHIVE}
|
18 |
+
REF ${OMPL_VERSION}
|
19 |
+
PATCHES
|
20 |
+
fix_dependency.patch
|
21 |
+
${STATIC_PATCH}
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
25 |
+
FEATURES
|
26 |
+
ode OMPLAPP_WITH_ODE
|
27 |
+
opengl OMPLAPP_WITH_OPENGL
|
28 |
+
threads OMPLAPP_WITH_THREADS
|
29 |
+
)
|
30 |
+
|
31 |
+
vcpkg_cmake_configure(
|
32 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
33 |
+
DISABLE_PARALLEL_CONFIGURE
|
34 |
+
OPTIONS
|
35 |
+
${FEATURE_OPTIONS}
|
36 |
+
-DOMPL_VERSIONED_INSTALL=OFF
|
37 |
+
-DOMPL_REGISTRATION=OFF
|
38 |
+
-DOMPL_BUILD_DEMOS=OFF
|
39 |
+
-DOMPL_BUILD_TESTS=OFF
|
40 |
+
-DOMPL_BUILD_PYBINDINGS=OFF
|
41 |
+
-DOMPL_BUILD_PYTESTS=OFF
|
42 |
+
# Not implement
|
43 |
+
-DOMPLAPP_WITH_PYTHON=OFF
|
44 |
+
-DOMPLAPP_WITH_TRIANGLE=OFF
|
45 |
+
-DOMPLAPP_WITH_OCTOMAP=OFF
|
46 |
+
-DOMPLAPP_WITH_FLANN=OFF # Requires 1.8.3
|
47 |
+
# Missing dependencies in vcpkg
|
48 |
+
-DOMPLAPP_WITH_SPOT=OFF
|
49 |
+
-DOMPLAPP_WITH_MORSE=OFF
|
50 |
+
-DOMPLAPP_WITH_DRAWSTUFF=OFF
|
51 |
+
-DOMPLAPP_WITH_PQP=OFF
|
52 |
+
-DOMPLAPP_WITH_DOXYGEN=OFF
|
53 |
+
)
|
54 |
+
|
55 |
+
vcpkg_cmake_install()
|
56 |
+
|
57 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake)
|
58 |
+
|
59 |
+
# Remove debug distribution and other, move ompl_benchmark to tools/ dir
|
60 |
+
vcpkg_copy_tools(TOOL_NAMES ompl_benchmark AUTO_CLEAN)
|
61 |
+
file(REMOVE_RECURSE
|
62 |
+
"${CURRENT_PACKAGES_DIR}/include/ompl"
|
63 |
+
"${CURRENT_PACKAGES_DIR}/bin"
|
64 |
+
"${CURRENT_PACKAGES_DIR}/include/omplapp/CMakeFiles"
|
65 |
+
"${CURRENT_PACKAGES_DIR}/lib/ompl.lib"
|
66 |
+
"${CURRENT_PACKAGES_DIR}/share/ompl"
|
67 |
+
"${CURRENT_PACKAGES_DIR}/share/man"
|
68 |
+
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
69 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
70 |
+
"${CURRENT_PACKAGES_DIR}/debug/lib/ompl.lib"
|
71 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
72 |
+
)
|
73 |
+
|
74 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/omplapp/config.h" "#define OMPLAPP_RESOURCE_DIR \"${CURRENT_PACKAGES_DIR}/share/ompl/resources\"" "")
|
75 |
+
|
76 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
77 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
78 |
+
endif()
|
79 |
+
|
80 |
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
81 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp")
|
82 |
+
if(NOT VCPKG_BUILD_TYPE)
|
83 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp")
|
84 |
+
endif()
|
85 |
+
vcpkg_fixup_pkgconfig()
|
86 |
+
endif()
|
87 |
+
|
88 |
+
# Handle copyright
|
89 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/omplapp/vcpkg.json
ADDED
@@ -0,0 +1,46 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "omplapp",
|
3 |
+
"version": "1.5.1",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "Use OMPL for reading meshes and performing collision checking",
|
6 |
+
"homepage": "https://ompl.kavrakilab.org/",
|
7 |
+
"dependencies": [
|
8 |
+
"assimp",
|
9 |
+
"boost-filesystem",
|
10 |
+
"boost-program-options",
|
11 |
+
"boost-serialization",
|
12 |
+
"boost-system",
|
13 |
+
"ccd",
|
14 |
+
"eigen3",
|
15 |
+
"fcl",
|
16 |
+
"ompl",
|
17 |
+
{
|
18 |
+
"name": "vcpkg-cmake",
|
19 |
+
"host": true
|
20 |
+
},
|
21 |
+
{
|
22 |
+
"name": "vcpkg-cmake-config",
|
23 |
+
"host": true
|
24 |
+
}
|
25 |
+
],
|
26 |
+
"features": {
|
27 |
+
"ode": {
|
28 |
+
"description": "Build with Open Dynamics Engine support",
|
29 |
+
"dependencies": [
|
30 |
+
"ode"
|
31 |
+
]
|
32 |
+
},
|
33 |
+
"opengl": {
|
34 |
+
"description": "Build with OpenGL support",
|
35 |
+
"dependencies": [
|
36 |
+
"opengl"
|
37 |
+
]
|
38 |
+
},
|
39 |
+
"threads": {
|
40 |
+
"description": "Build with Threads support",
|
41 |
+
"dependencies": [
|
42 |
+
"pthreads"
|
43 |
+
]
|
44 |
+
}
|
45 |
+
}
|
46 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onednn/portfile.cmake
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO oneapi-src/oneDNN
|
4 |
+
REF v2.4.3
|
5 |
+
SHA512 6a597be1b6b50d252e346a96d3c9b4771e9d8e8fc495a09b638ea296d53e71d51ea2e2be04cc20de1bca17215a7a7e5f22a1808628bcdf98180def2d91b2c9e3
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
10 |
+
set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC")
|
11 |
+
endif()
|
12 |
+
|
13 |
+
vcpkg_cmake_configure(
|
14 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
15 |
+
OPTIONS ${DNNL_OPTIONS}
|
16 |
+
)
|
17 |
+
vcpkg_cmake_install()
|
18 |
+
|
19 |
+
# The port name and the find_package() name are different (onednn versus dnnl)
|
20 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl)
|
21 |
+
|
22 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
23 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
24 |
+
|
25 |
+
# Copyright and license
|
26 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onednn/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "onednn",
|
3 |
+
"version-semver": "2.4.3",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "oneAPI Deep Neural Network Library (oneDNN)",
|
6 |
+
"homepage": "https://github.com/oneapi-src/oneDNN",
|
7 |
+
"supports": "x64 & !uwp",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
]
|
18 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/fix-uwp.patch
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/regcomp.c b/src/regcomp.c
|
2 |
+
--- a/src/regcomp.c
|
3 |
+
+++ b/src/regcomp.c
|
4 |
+
@@ -3880,7 +3880,7 @@ reduce_string_list(Node* node)
|
5 |
+
{
|
6 |
+
Node* prev;
|
7 |
+
Node* curr;
|
8 |
+
- Node* prev_node;
|
9 |
+
+ Node* prev_node = NULL;
|
10 |
+
Node* next_node;
|
11 |
+
|
12 |
+
prev = NULL_NODE;
|
13 |
+
diff --git a/src/regexec.c b/src/regexec.c
|
14 |
+
index ce498c6..6848c0f 100644
|
15 |
+
--- a/src/regexec.c
|
16 |
+
+++ b/src/regexec.c
|
17 |
+
@@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set,
|
18 |
+
{
|
19 |
+
int r, n, i;
|
20 |
+
UChar *s;
|
21 |
+
- UChar *low, *high;
|
22 |
+
+ UChar *low, *high = NULL;
|
23 |
+
UChar* sch_range;
|
24 |
+
regex_t* reg;
|
25 |
+
OnigEncoding enc;
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/portfile.cmake
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO kkos/oniguruma
|
4 |
+
REF v6.9.7.1
|
5 |
+
SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES fix-uwp.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
11 |
+
INVERTED_FEATURES
|
12 |
+
"non-posix" ENABLE_POSIX_API
|
13 |
+
)
|
14 |
+
|
15 |
+
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
16 |
+
set(MSVC_STATIC_RUNTIME ON)
|
17 |
+
else()
|
18 |
+
set(MSVC_STATIC_RUNTIME OFF)
|
19 |
+
endif()
|
20 |
+
|
21 |
+
vcpkg_cmake_configure(
|
22 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
23 |
+
OPTIONS
|
24 |
+
${FEATURE_OPTIONS}
|
25 |
+
-DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME}
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_cmake_install()
|
29 |
+
|
30 |
+
vcpkg_copy_pdbs()
|
31 |
+
|
32 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
33 |
+
|
34 |
+
file(REMOVE_RECURSE
|
35 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
36 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
37 |
+
)
|
38 |
+
|
39 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
40 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h"
|
41 |
+
"#if defined(ONIGURUMA_EXPORT)"
|
42 |
+
"#if 0 // defined(ONIGURUMA_EXPORT)"
|
43 |
+
)
|
44 |
+
else()
|
45 |
+
# oniguruma.h uses `\n` as line break.
|
46 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h"
|
47 |
+
"#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)"
|
48 |
+
"#if 0\n#if defined(_WIN32) && !defined(__GNUC__)"
|
49 |
+
)
|
50 |
+
endif()
|
51 |
+
|
52 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
53 |
+
|
54 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/oniguruma/vcpkg.json
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "oniguruma",
|
3 |
+
"version": "6.9.7.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Modern and flexible regular expressions library",
|
6 |
+
"homepage": "https://github.com/kkos/oniguruma",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
],
|
17 |
+
"features": {
|
18 |
+
"non-posix": {
|
19 |
+
"description": "Disable POSIX API"
|
20 |
+
}
|
21 |
+
}
|
22 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/fix-cmakelists.patch
ADDED
@@ -0,0 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index c2e48b3..5716fbb 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -7,10 +7,18 @@ if(NOT MSVC)
|
6 |
+
set(CMAKE_CXX_STANDARD 11)
|
7 |
+
endif(NOT MSVC)
|
8 |
+
|
9 |
+
+# Add MSVC RunTime Flag
|
10 |
+
+function(add_msvc_runtime_flag lib)
|
11 |
+
+ if(${ONNX_USE_MSVC_STATIC_RUNTIME})
|
12 |
+
+ target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MT> $<$<CONFIG:Debug>:/MTd>)
|
13 |
+
+ else()
|
14 |
+
+ target_compile_options(${lib} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MD> $<$<CONFIG:Debug>:/MDd>)
|
15 |
+
+ endif()
|
16 |
+
+endfunction()
|
17 |
+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
18 |
+
|
19 |
+
-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
|
20 |
+
-add_subdirectory(${ONNX_ROOT})
|
21 |
+
+find_package(protobuf CONFIG REQUIRED)
|
22 |
+
+find_package(ONNX CONFIG REQUIRED)
|
23 |
+
|
24 |
+
file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
|
25 |
+
string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
|
26 |
+
@@ -31,6 +39,7 @@ add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
|
27 |
+
target_link_libraries(onnx_optimizer_exec onnx_optimizer)
|
28 |
+
|
29 |
+
if(BUILD_ONNX_PYTHON)
|
30 |
+
+ find_package(Python3 COMPONENTS Development REQUIRED)
|
31 |
+
if("${PY_EXT_SUFFIX}" STREQUAL "")
|
32 |
+
if(MSVC)
|
33 |
+
set(PY_EXT_SUFFIX ".pyd")
|
34 |
+
@@ -51,7 +60,7 @@ if(BUILD_ONNX_PYTHON)
|
35 |
+
$<INSTALL_INTERFACE:include>
|
36 |
+
${PYTHON_INCLUDE_DIR})
|
37 |
+
# pybind11 is a header only lib
|
38 |
+
- find_package(pybind11 2.2)
|
39 |
+
+ find_package(pybind11 2.2 CONFIG REQUIRED)
|
40 |
+
if(pybind11_FOUND)
|
41 |
+
target_include_directories(onnx_opt_cpp2py_export PUBLIC
|
42 |
+
${pybind11_INCLUDE_DIRS})
|
43 |
+
@@ -87,11 +96,9 @@ if(BUILD_ONNX_PYTHON)
|
44 |
+
endif()
|
45 |
+
|
46 |
+
target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
|
47 |
+
-
|
48 |
+
+ target_link_directories(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARY_DIRS})
|
49 |
+
+ target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARIES})
|
50 |
+
if(MSVC)
|
51 |
+
- find_package(PythonInterp ${PY_VERSION} REQUIRED)
|
52 |
+
- find_package(PythonLibs ${PY_VERSION} REQUIRED)
|
53 |
+
- target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${PYTHON_LIBRARIES})
|
54 |
+
target_compile_options(onnx_opt_cpp2py_export
|
55 |
+
PRIVATE /MP
|
56 |
+
/WX
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/portfile.cmake
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO onnx/optimizer
|
6 |
+
REF v0.2.6
|
7 |
+
SHA512 cc6373781f04bc6fafd3282d248e26eaf93556b86acbb0dee44b4aa7a5d59c634905c1a05d035e31a50fc0f06cfc686fa483b79a324dd973faa421747d4a681b
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
fix-cmakelists.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
FEATURES
|
15 |
+
pybind11 BUILD_ONNX_PYTHON
|
16 |
+
)
|
17 |
+
if("pybind11" IN_LIST FEATURES)
|
18 |
+
vcpkg_find_acquire_program(PYTHON3)
|
19 |
+
list(APPEND FEATURE_OPTIONS
|
20 |
+
-DPython3_EXECUTABLE=${PYTHON3}
|
21 |
+
-DONNX_USE_PROTOBUF_SHARED_LIBS=ON # /wd4251
|
22 |
+
)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
vcpkg_cmake_configure(
|
26 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
27 |
+
OPTIONS
|
28 |
+
${FEATURE_OPTIONS}
|
29 |
+
)
|
30 |
+
if("pybind11" IN_LIST FEATURES)
|
31 |
+
# This target is not in install/export
|
32 |
+
vcpkg_cmake_build(TARGET onnx_opt_cpp2py_export)
|
33 |
+
endif()
|
34 |
+
vcpkg_cmake_install()
|
35 |
+
vcpkg_copy_pdbs()
|
36 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME ONNXOptimizer CONFIG_PATH lib/cmake/ONNXOptimizer)
|
37 |
+
|
38 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE"
|
39 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
40 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
|
41 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
42 |
+
"${CURRENT_PACKAGES_DIR}/include/onnxoptimizer/test"
|
43 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx-optimizer/vcpkg.json
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "onnx-optimizer",
|
3 |
+
"version-semver": "0.2.6",
|
4 |
+
"description": "Actively maintained ONNX Optimizer",
|
5 |
+
"homepage": "https://github.com/onnx/optimizer",
|
6 |
+
"license": "Apache-2.0",
|
7 |
+
"dependencies": [
|
8 |
+
"onnx",
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
],
|
18 |
+
"features": {
|
19 |
+
"pybind11": {
|
20 |
+
"description": "Build Python binaries",
|
21 |
+
"dependencies": [
|
22 |
+
{
|
23 |
+
"name": "onnx",
|
24 |
+
"features": [
|
25 |
+
"pybind11"
|
26 |
+
]
|
27 |
+
}
|
28 |
+
]
|
29 |
+
}
|
30 |
+
}
|
31 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/fix-cmakelists.patch
ADDED
@@ -0,0 +1,86 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 628dcaa..300e4ea 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -111,8 +111,8 @@ endif()
|
6 |
+
# find_package Python has replaced PythonInterp and PythonLibs since cmake 3.12
|
7 |
+
# Use the following command in the future; now this is only compatible with the latest pybind11
|
8 |
+
# find_package(Python ${PY_VERSION} COMPONENTS Interpreter Development REQUIRED)
|
9 |
+
-find_package(PythonInterp ${PY_VERSION} REQUIRED)
|
10 |
+
-find_package(PythonLibs ${PY_VERSION})
|
11 |
+
+find_package(Python3 ${PY_VERSION} COMPONENTS Interpreter REQUIRED)
|
12 |
+
+set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
|
13 |
+
|
14 |
+
if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
|
15 |
+
set(CMAKE_NO_SYSTEM_FROM_IMPORTED 1)
|
16 |
+
@@ -422,6 +422,7 @@ target_link_libraries(onnx PUBLIC onnx_proto)
|
17 |
+
add_onnx_global_defines(onnx)
|
18 |
+
|
19 |
+
if(BUILD_ONNX_PYTHON)
|
20 |
+
+ find_package(Python3 ${PY_VERSION} COMPONENTS Development REQUIRED)
|
21 |
+
if("${PY_EXT_SUFFIX}" STREQUAL "")
|
22 |
+
if(MSVC)
|
23 |
+
set(PY_EXT_SUFFIX ".pyd")
|
24 |
+
@@ -441,10 +442,13 @@ if(BUILD_ONNX_PYTHON)
|
25 |
+
$<BUILD_INTERFACE:${ONNX_ROOT}>
|
26 |
+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
27 |
+
$<INSTALL_INTERFACE:include>
|
28 |
+
- ${PYTHON_INCLUDE_DIR})
|
29 |
+
-
|
30 |
+
+ ${Python3_INCLUDE_DIRS})
|
31 |
+
+ target_link_directories(onnx_cpp2py_export PRIVATE
|
32 |
+
+ ${Python3_LIBRARY_DIRS})
|
33 |
+
+ target_link_libraries(onnx_cpp2py_export PRIVATE
|
34 |
+
+ ${Python3_LIBRARIES})
|
35 |
+
# pybind11 is a header only lib
|
36 |
+
- find_package(pybind11 2.2)
|
37 |
+
+ find_package(pybind11 2.2 CONFIG REQUIRED)
|
38 |
+
if(pybind11_FOUND)
|
39 |
+
target_include_directories(onnx_cpp2py_export PUBLIC
|
40 |
+
${pybind11_INCLUDE_DIRS})
|
41 |
+
@@ -687,6 +691,27 @@ endif()
|
42 |
+
|
43 |
+
include(GNUInstallDirs)
|
44 |
+
|
45 |
+
+# install protobuf files
|
46 |
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto
|
47 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto3
|
48 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto
|
49 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto3
|
50 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto
|
51 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto3
|
52 |
+
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx
|
53 |
+
+)
|
54 |
+
+# install python files
|
55 |
+
+if(BUILD_ONNX_PYTHON)
|
56 |
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb.py
|
57 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb2.py
|
58 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_ml_pb2.py
|
59 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_ml_pb2.py
|
60 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_pb.py
|
61 |
+
+ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_pb.py
|
62 |
+
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx
|
63 |
+
+ )
|
64 |
+
+endif()
|
65 |
+
+
|
66 |
+
install(DIRECTORY ${ONNX_ROOT}/onnx
|
67 |
+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
68 |
+
FILES_MATCHING
|
69 |
+
@@ -639,7 +639,7 @@ endif()
|
70 |
+
|
71 |
+
if (NOT ANDROID AND NOT IOS)
|
72 |
+
# ---[ ONNXIFI wrapper
|
73 |
+
- add_library(onnxifi_wrapper MODULE onnx/onnxifi_wrapper.c)
|
74 |
+
+ add_library(onnxifi_wrapper onnx/onnxifi_wrapper.c)
|
75 |
+
if(MSVC)
|
76 |
+
add_msvc_runtime_flag(onnxifi_wrapper)
|
77 |
+
endif()
|
78 |
+
@@ -669,7 +669,7 @@ if (NOT ANDROID AND NOT IOS)
|
79 |
+
endif()
|
80 |
+
|
81 |
+
# ---[ ONNXIFI dummy backend
|
82 |
+
-add_library(onnxifi_dummy SHARED onnx/onnxifi_dummy.c)
|
83 |
+
+add_library(onnxifi_dummy onnx/onnxifi_dummy.c)
|
84 |
+
|
85 |
+
if(ONNXIFI_ENABLE_EXT)
|
86 |
+
add_definitions(-DONNXIFI_ENABLE_EXT=ON)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/fix-dependency-protobuf.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 1295eab..0fb9f17 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS)
|
6 |
+
include(googletest)
|
7 |
+
endif()
|
8 |
+
|
9 |
+
+find_package(protobuf CONFIG REQUIRED)
|
10 |
+
if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf))
|
11 |
+
# Sometimes we need to use protoc compiled for host architecture while linking
|
12 |
+
# libprotobuf against target architecture. See https://github.com/caffe2/caffe
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/portfile.cmake
ADDED
@@ -0,0 +1,95 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO onnx/onnx
|
6 |
+
REF v1.10.2
|
7 |
+
SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303
|
8 |
+
PATCHES
|
9 |
+
fix-cmakelists.patch
|
10 |
+
fix-dependency-protobuf.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME)
|
14 |
+
|
15 |
+
# ONNX_USE_PROTOBUF_SHARED_LIBS: find the library and check its file extension
|
16 |
+
find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" REQUIRED)
|
17 |
+
get_filename_component(PROTOBUF_LIBNAME "${PROTOBUF_LIBPATH}" NAME)
|
18 |
+
if(PROTOBUF_LIBNAME MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
19 |
+
set(USE_PROTOBUF_SHARED ON)
|
20 |
+
else()
|
21 |
+
set(USE_PROTOBUF_SHARED OFF)
|
22 |
+
endif()
|
23 |
+
|
24 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
25 |
+
FEATURES
|
26 |
+
pybind11 BUILD_ONNX_PYTHON
|
27 |
+
)
|
28 |
+
|
29 |
+
# Like protoc, python is required for codegen.
|
30 |
+
vcpkg_find_acquire_program(PYTHON3)
|
31 |
+
|
32 |
+
# PATH for .bat scripts so it can find 'python'
|
33 |
+
get_filename_component(PYTHON_DIR "${PYTHON3}" PATH)
|
34 |
+
vcpkg_add_to_path(PREPEND "${PYTHON_DIR}")
|
35 |
+
|
36 |
+
if("pybind11" IN_LIST FEATURES)
|
37 |
+
# When BUILD_ONNX_PYTHON, we need Development component. Give a hint for FindPython3
|
38 |
+
list(APPEND FEATURE_OPTIONS
|
39 |
+
"-DPython3_ROOT_DIR=${CURRENT_INSTALLED_DIR}"
|
40 |
+
)
|
41 |
+
endif()
|
42 |
+
|
43 |
+
vcpkg_cmake_configure(
|
44 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
45 |
+
OPTIONS
|
46 |
+
${FEATURE_OPTIONS}
|
47 |
+
-DPython3_EXECUTABLE=${PYTHON3}
|
48 |
+
-DONNX_ML=ON
|
49 |
+
-DONNX_GEN_PB_TYPE_STUBS=ON
|
50 |
+
-DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED}
|
51 |
+
-DONNX_USE_LITE_PROTO=OFF
|
52 |
+
-DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME}
|
53 |
+
-DONNX_BUILD_TESTS=OFF
|
54 |
+
-DONNX_BUILD_BENCHMARKS=OFF
|
55 |
+
MAYBE_UNUSED_VARIABLES
|
56 |
+
ONNX_USE_MSVC_STATIC_RUNTIME
|
57 |
+
)
|
58 |
+
|
59 |
+
if("pybind11" IN_LIST FEATURES)
|
60 |
+
# This target is not in install/export
|
61 |
+
vcpkg_cmake_build(TARGET onnx_cpp2py_export)
|
62 |
+
endif()
|
63 |
+
vcpkg_cmake_install()
|
64 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ONNX)
|
65 |
+
|
66 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
67 |
+
|
68 |
+
file(REMOVE_RECURSE
|
69 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
70 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
71 |
+
# the others are empty
|
72 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/backend"
|
73 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/bin"
|
74 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow"
|
75 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator"
|
76 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical"
|
77 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/math"
|
78 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn"
|
79 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/object_detection"
|
80 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/optional"
|
81 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/quantization"
|
82 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction"
|
83 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn"
|
84 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence"
|
85 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml"
|
86 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/defs/training"
|
87 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/examples"
|
88 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/frontend"
|
89 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export"
|
90 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/test"
|
91 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/tools"
|
92 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/onnx_ml"
|
93 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/onnx_data"
|
94 |
+
"${CURRENT_PACKAGES_DIR}/include/onnx/onnx_operators_ml"
|
95 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnx/vcpkg.json
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "onnx",
|
3 |
+
"version-semver": "1.10.2",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Open standard for machine learning interoperability",
|
6 |
+
"homepage": "https://onnx.ai",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"supports": "!uwp",
|
9 |
+
"dependencies": [
|
10 |
+
"protobuf",
|
11 |
+
{
|
12 |
+
"name": "protobuf",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "python3",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake",
|
21 |
+
"host": true
|
22 |
+
},
|
23 |
+
{
|
24 |
+
"name": "vcpkg-cmake-config",
|
25 |
+
"host": true
|
26 |
+
}
|
27 |
+
],
|
28 |
+
"features": {
|
29 |
+
"pybind11": {
|
30 |
+
"description": "Build Python binaries",
|
31 |
+
"dependencies": [
|
32 |
+
"pybind11"
|
33 |
+
]
|
34 |
+
}
|
35 |
+
}
|
36 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnxruntime-gpu/portfile.cmake
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
2 |
+
|
3 |
+
set(VERSION 1.5.1)
|
4 |
+
|
5 |
+
vcpkg_download_distfile(ARCHIVE
|
6 |
+
URLS "https://github.com/microsoft/onnxruntime/releases/download/v1.5.1/onnxruntime-win-x64-gpu-1.5.1.zip"
|
7 |
+
FILENAME "onnxruntime-win-x64-gpu-1.5.1.zip"
|
8 |
+
SHA512 893dbed1196b5c9730744dc5566cd3ad8ec677cbea04dd0572efc9a8b3563d3f1cbf40d0dea3d624d9451dc33272c0ae44d53d6deee6f249fa2520e60718ee52
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_extract_source_archive_ex(
|
12 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
13 |
+
ARCHIVE ${ARCHIVE}
|
14 |
+
NO_REMOVE_ONE_LEVEL
|
15 |
+
REF ${VERSION}
|
16 |
+
)
|
17 |
+
|
18 |
+
file(MAKE_DIRECTORY
|
19 |
+
${CURRENT_PACKAGES_DIR}/include
|
20 |
+
${CURRENT_PACKAGES_DIR}/lib
|
21 |
+
${CURRENT_PACKAGES_DIR}/bin
|
22 |
+
${CURRENT_PACKAGES_DIR}/debug/lib
|
23 |
+
${CURRENT_PACKAGES_DIR}/debug/bin
|
24 |
+
)
|
25 |
+
|
26 |
+
file(COPY
|
27 |
+
${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/include
|
28 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}
|
29 |
+
)
|
30 |
+
|
31 |
+
file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.lib
|
32 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
|
33 |
+
file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.lib
|
34 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
|
35 |
+
file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.dll
|
36 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
|
37 |
+
file(COPY ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/lib/onnxruntime.dll
|
38 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
|
39 |
+
|
40 |
+
# # Handle copyright
|
41 |
+
file(INSTALL ${SOURCE_PATH}/onnxruntime-win-x64-gpu-1.5.1/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/onnxruntime-gpu/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "onnxruntime-gpu",
|
3 |
+
"version": "1.5.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "onnxruntime (GPU)",
|
6 |
+
"homepage": "https://github.com/microsoft/onnxruntime",
|
7 |
+
"supports": "windows & !x86 & !uwp & !static & !arm"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/oof/portfile.cmake
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Header-only library
|
2 |
+
vcpkg_from_github(
|
3 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
4 |
+
REPO s9w/oof
|
5 |
+
REF a0c3e8e0dceec391bd38861ab108b932a2513bcb
|
6 |
+
SHA512 4d5650c8fa1e21e7fe71dbe615a6e3bdbe3781be28811e895ac335261de24b3ed26c4842cdd133df897cdb7181c3ea11c051607fbda5a7a1b9a4d8580323181d
|
7 |
+
HEAD_REF master
|
8 |
+
)
|
9 |
+
|
10 |
+
file(INSTALL "${SOURCE_PATH}/oof.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
11 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/oof/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "oof",
|
3 |
+
"version-date": "2021-11-23",
|
4 |
+
"description": "Convenient, high-performance RGB color and position control for console output.",
|
5 |
+
"homepage": "https://github.com/s9w/oof",
|
6 |
+
"license": "MIT"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/openssl.patch
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 9184b943..bd9203f7 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -526,7 +526,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST
|
6 |
+
check_add_cc_flag("-Wall") # Warnings
|
7 |
+
check_add_cc_flag("-Wextra") # More warnings
|
8 |
+
check_add_cc_flag("-Wpedantic") # Standard compliance
|
9 |
+
- check_add_cc_flag("-Werror") # All warnings are errors
|
10 |
+
+ #check_add_cc_flag("-Werror") # All warnings are errors
|
11 |
+
|
12 |
+
check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods
|
13 |
+
check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded
|
14 |
+
@@ -659,7 +659,7 @@ if(APPLE)
|
15 |
+
endif()
|
16 |
+
|
17 |
+
if(MSVC)
|
18 |
+
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996") # Compiler warnings, error on warning
|
19 |
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996 /wd4090") # Compiler warnings, error on warning
|
20 |
+
|
21 |
+
if(UA_MSVC_FORCE_STATIC_CRT AND NOT BUILD_SHARED_LIBS)
|
22 |
+
set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/portfile.cmake
ADDED
@@ -0,0 +1,44 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set(VERSION v1.2.3)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO open62541/open62541
|
6 |
+
REF "${VERSION}"
|
7 |
+
SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
openssl.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(
|
14 |
+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES
|
16 |
+
openssl UA_ENABLE_ENCRYPTION_OPENSSL
|
17 |
+
mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS
|
18 |
+
amalgamation UA_ENABLE_AMALGAMATION
|
19 |
+
historizing UA_ENABLE_HISTORIZING
|
20 |
+
)
|
21 |
+
|
22 |
+
vcpkg_find_acquire_program(PYTHON3)
|
23 |
+
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
|
24 |
+
vcpkg_add_to_path("${PYTHON3_DIR}")
|
25 |
+
|
26 |
+
vcpkg_cmake_configure(
|
27 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
28 |
+
OPTIONS
|
29 |
+
${FEATURE_OPTIONS}
|
30 |
+
-DOPEN62541_VERSION=${VERSION}
|
31 |
+
OPTIONS_DEBUG
|
32 |
+
-DCMAKE_DEBUG_POSTFIX=d
|
33 |
+
)
|
34 |
+
|
35 |
+
vcpkg_cmake_install()
|
36 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
37 |
+
vcpkg_copy_pdbs()
|
38 |
+
vcpkg_fixup_pkgconfig()
|
39 |
+
|
40 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
41 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
42 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools")
|
43 |
+
|
44 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/open62541/vcpkg.json
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "open62541",
|
3 |
+
"version": "1.2.3",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
|
6 |
+
"homepage": "https://open62541.org",
|
7 |
+
"license": "MPL-2.0",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
],
|
18 |
+
"default-features": [
|
19 |
+
"openssl"
|
20 |
+
],
|
21 |
+
"features": {
|
22 |
+
"amalgamation": {
|
23 |
+
"description": "Concatenate the library to a single file open62541.h/.c"
|
24 |
+
},
|
25 |
+
"historizing": {
|
26 |
+
"description": "Enable basic support for historical access (client and server)"
|
27 |
+
},
|
28 |
+
"mbedtls": {
|
29 |
+
"description": "Enable encryption support (uses MbedTLS)",
|
30 |
+
"dependencies": [
|
31 |
+
"mbedtls"
|
32 |
+
]
|
33 |
+
},
|
34 |
+
"openssl": {
|
35 |
+
"description": "Enable encryption support (uses OpenSSL)",
|
36 |
+
"dependencies": [
|
37 |
+
"openssl"
|
38 |
+
]
|
39 |
+
}
|
40 |
+
}
|
41 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/dont-export-symbols-in-static-build.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/config.h.in b/config.h.in
|
2 |
+
--- a/config.h.in
|
3 |
+
+++ b/config.h.in
|
4 |
+
@@ -1,6 +1,8 @@
|
5 |
+
/* API declaration export attribute */
|
6 |
+
+#ifndef AL_LIBTYPE_STATIC
|
7 |
+
#define AL_API ${EXPORT_DECL}
|
8 |
+
#define ALC_API ${EXPORT_DECL}
|
9 |
+
+#endif
|
10 |
+
|
11 |
+
/* Define if HRTF data is embedded in the library */
|
12 |
+
#cmakedefine ALSOFT_EMBED_HRTF_DATA
|
13 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/portfile.cmake
ADDED
@@ -0,0 +1,96 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO kcat/openal-soft
|
4 |
+
REF ae4eacf147e2c2340cc4e02a790df04c793ed0a9 # openal-soft-1.21.1
|
5 |
+
SHA512 6ba006d3dad6efe002f285ff509a59f02b499ec3f6065df12a89c52355464117b4dbabcd04ee9cbf22cc3b4125c8e456769b172f8c3e9ee215e760b2c51a0a8f
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
dont-export-symbols-in-static-build.patch
|
9 |
+
)
|
10 |
+
|
11 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
12 |
+
set(OPENAL_LIBTYPE "SHARED")
|
13 |
+
else()
|
14 |
+
set(OPENAL_LIBTYPE "STATIC")
|
15 |
+
endif()
|
16 |
+
|
17 |
+
set(ALSOFT_REQUIRE_LINUX OFF)
|
18 |
+
set(ALSOFT_REQUIRE_WINDOWS OFF)
|
19 |
+
set(ALSOFT_REQUIRE_APPLE OFF)
|
20 |
+
|
21 |
+
if(VCPKG_TARGET_IS_LINUX)
|
22 |
+
set(ALSOFT_REQUIRE_LINUX ON)
|
23 |
+
endif()
|
24 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
25 |
+
set(ALSOFT_REQUIRE_WINDOWS ON)
|
26 |
+
endif()
|
27 |
+
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
|
28 |
+
set(ALSOFT_REQUIRE_APPLE ON)
|
29 |
+
endif()
|
30 |
+
|
31 |
+
vcpkg_configure_cmake(
|
32 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
33 |
+
OPTIONS
|
34 |
+
-DLIBTYPE=${OPENAL_LIBTYPE}
|
35 |
+
-DALSOFT_UTILS=OFF
|
36 |
+
-DALSOFT_NO_CONFIG_UTIL=ON
|
37 |
+
-DALSOFT_EXAMPLES=OFF
|
38 |
+
-DALSOFT_CONFIG=OFF
|
39 |
+
-DALSOFT_HRTF_DEFS=OFF
|
40 |
+
-DALSOFT_AMBDEC_PRESETS=OFF
|
41 |
+
-DALSOFT_BACKEND_ALSA=${ALSOFT_REQUIRE_LINUX}
|
42 |
+
-DALSOFT_BACKEND_OSS=OFF
|
43 |
+
-DALSOFT_BACKEND_SOLARIS=OFF
|
44 |
+
-DALSOFT_BACKEND_SNDIO=OFF
|
45 |
+
-DALSOFT_BACKEND_PORTAUDIO=OFF
|
46 |
+
-DALSOFT_BACKEND_PULSEAUDIO=OFF
|
47 |
+
-DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE}
|
48 |
+
-DALSOFT_BACKEND_JACK=OFF
|
49 |
+
-DALSOFT_BACKEND_OPENSL=OFF
|
50 |
+
-DALSOFT_BACKEND_WAVE=ON
|
51 |
+
-DALSOFT_BACKEND_WINMM=OFF
|
52 |
+
-DALSOFT_BACKEND_DSOUND=OFF
|
53 |
+
-DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS}
|
54 |
+
-DALSOFT_CPUEXT_NEON=OFF
|
55 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON
|
56 |
+
MAYBE_UNUSED_VARIABLES
|
57 |
+
ALSOFT_AMBDEC_PRESETS
|
58 |
+
ALSOFT_BACKEND_ALSA
|
59 |
+
ALSOFT_BACKEND_COREAUDIO
|
60 |
+
ALSOFT_BACKEND_JACK
|
61 |
+
ALSOFT_BACKEND_OPENSL
|
62 |
+
ALSOFT_BACKEND_OSS
|
63 |
+
ALSOFT_BACKEND_PORTAUDIO
|
64 |
+
ALSOFT_BACKEND_PULSEAUDIO
|
65 |
+
ALSOFT_BACKEND_SNDIO
|
66 |
+
ALSOFT_BACKEND_SOLARIS
|
67 |
+
ALSOFT_CONFIG
|
68 |
+
ALSOFT_CPUEXT_NEON
|
69 |
+
ALSOFT_HRTF_DEFS
|
70 |
+
CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK
|
71 |
+
)
|
72 |
+
|
73 |
+
vcpkg_install_cmake()
|
74 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenAL")
|
75 |
+
|
76 |
+
foreach(HEADER al.h alc.h)
|
77 |
+
file(READ "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" AL_H)
|
78 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
79 |
+
string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}")
|
80 |
+
else()
|
81 |
+
# Normally we would say:
|
82 |
+
# string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}")
|
83 |
+
# but we are leaving these undefined macros alone in support of
|
84 |
+
# https://github.com/microsoft/vcpkg/issues/18098
|
85 |
+
endif()
|
86 |
+
file(WRITE "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" "${AL_H}")
|
87 |
+
endforeach()
|
88 |
+
|
89 |
+
vcpkg_fixup_pkgconfig()
|
90 |
+
|
91 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
92 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
93 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
94 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
95 |
+
|
96 |
+
vcpkg_copy_pdbs()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package openal-soft provides CMake targets:
|
2 |
+
|
3 |
+
find_package(OpenAL CONFIG REQUIRED)
|
4 |
+
target_link_libraries(main PRIVATE OpenAL::OpenAL)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openal-soft/vcpkg.json
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "openal-soft",
|
3 |
+
"version-semver": "1.21.1",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.",
|
6 |
+
"homepage": "https://github.com/kcat/openal-soft",
|
7 |
+
"supports": "!uwp"
|
8 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-redefinition-function.patch
ADDED
@@ -0,0 +1,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/openblas_config_template.h b/openblas_config_template.h
|
2 |
+
index 52dd49d..239219d 100644
|
3 |
+
--- a/openblas_config_template.h
|
4 |
+
+++ b/openblas_config_template.h
|
5 |
+
@@ -64,6 +64,7 @@ typedef int blasint;
|
6 |
+
#ifndef __cplusplus
|
7 |
+
#include <complex.h>
|
8 |
+
#endif
|
9 |
+
+ #ifndef OPENBLAS_COMPLEX_STRUCT
|
10 |
+
typedef float _Complex openblas_complex_float;
|
11 |
+
typedef double _Complex openblas_complex_double;
|
12 |
+
typedef xdouble _Complex openblas_complex_xdouble;
|
13 |
+
@@ -76,7 +77,9 @@ typedef int blasint;
|
14 |
+
#define openblas_complex_double_imag(z) (cimag(z))
|
15 |
+
#define openblas_complex_xdouble_real(z) (creal(z))
|
16 |
+
#define openblas_complex_xdouble_imag(z) (cimag(z))
|
17 |
+
+ #endif
|
18 |
+
#else
|
19 |
+
+ #ifndef OPENBLAS_COMPLEX_STRUCT
|
20 |
+
#define OPENBLAS_COMPLEX_STRUCT
|
21 |
+
typedef struct { float real, imag; } openblas_complex_float;
|
22 |
+
typedef struct { double real, imag; } openblas_complex_double;
|
23 |
+
@@ -90,4 +93,5 @@ typedef int blasint;
|
24 |
+
#define openblas_complex_double_imag(z) ((z).imag)
|
25 |
+
#define openblas_complex_xdouble_real(z) ((z).real)
|
26 |
+
#define openblas_complex_xdouble_imag(z) ((z).imag)
|
27 |
+
+ #endif
|
28 |
+
#endif
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-space-path.patch
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
2 |
+
index 58ca1eb..e2f2134 100644
|
3 |
+
--- a/cmake/prebuild.cmake
|
4 |
+
+++ b/cmake/prebuild.cmake
|
5 |
+
@@ -490,14 +490,14 @@ else(NOT CMAKE_CROSSCOMPILING)
|
6 |
+
|
7 |
+
set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build")
|
8 |
+
set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}")
|
9 |
+
- file(MAKE_DIRECTORY ${GETARCH_DIR})
|
10 |
+
- configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY)
|
11 |
+
+ file(MAKE_DIRECTORY "${GETARCH_DIR}")
|
12 |
+
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY)
|
13 |
+
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
14 |
+
- try_compile(GETARCH_RESULT ${GETARCH_DIR}
|
15 |
+
+ try_compile(GETARCH_RESULT "${GETARCH_DIR}"
|
16 |
+
SOURCES ${GETARCH_SRC}
|
17 |
+
COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
|
18 |
+
OUTPUT_VARIABLE GETARCH_LOG
|
19 |
+
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN}
|
20 |
+
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}"
|
21 |
+
)
|
22 |
+
|
23 |
+
if (NOT ${GETARCH_RESULT})
|
24 |
+
@@ -518,14 +518,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA
|
25 |
+
|
26 |
+
set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build")
|
27 |
+
set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}")
|
28 |
+
- file(MAKE_DIRECTORY ${GETARCH2_DIR})
|
29 |
+
- configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY)
|
30 |
+
+ file(MAKE_DIRECTORY "${GETARCH2_DIR}")
|
31 |
+
+ configure_file(${TARGET_CONF_TEMP} "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY)
|
32 |
+
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
|
33 |
+
- try_compile(GETARCH2_RESULT ${GETARCH2_DIR}
|
34 |
+
- SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c
|
35 |
+
+ try_compile(GETARCH2_RESULT "${GETARCH2_DIR}"
|
36 |
+
+ SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c"
|
37 |
+
COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}"
|
38 |
+
OUTPUT_VARIABLE GETARCH2_LOG
|
39 |
+
- COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN}
|
40 |
+
+ COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}"
|
41 |
+
)
|
42 |
+
|
43 |
+
if (NOT ${GETARCH2_RESULT})
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/fix-uwp-build.patch
ADDED
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/common_stackalloc.h b/common_stackalloc.h
|
2 |
+
index d3d5466..cd157fc 100644
|
3 |
+
--- a/common_stackalloc.h
|
4 |
+
+++ b/common_stackalloc.h
|
5 |
+
@@ -36,7 +36,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
6 |
+
#define STACK_ALLOC_PROTECT_CHECK
|
7 |
+
#endif
|
8 |
+
|
9 |
+
-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
|
10 |
+
+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
|
11 |
+
|
12 |
+
/*
|
13 |
+
* Allocate a buffer on the stack if the size is smaller than MAX_STACK_ALLOC.
|
14 |
+
@@ -63,7 +63,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
15 |
+
#endif
|
16 |
+
|
17 |
+
|
18 |
+
-#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
|
19 |
+
+#if defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
|
20 |
+
#define STACK_FREE(BUFFER) \
|
21 |
+
STACK_ALLOC_PROTECT_CHECK \
|
22 |
+
if(!stack_alloc_size) \
|
23 |
+
diff --git a/interface/zgemv.c b/interface/zgemv.c
|
24 |
+
index 3e98dba..ee597f7 100644
|
25 |
+
--- a/interface/zgemv.c
|
26 |
+
+++ b/interface/zgemv.c
|
27 |
+
@@ -244,7 +244,7 @@ void CNAME(enum CBLAS_ORDER order,
|
28 |
+
buffer_size = (buffer_size + 3) & ~3;
|
29 |
+
STACK_ALLOC(buffer_size, FLOAT, buffer);
|
30 |
+
|
31 |
+
-#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0
|
32 |
+
+#if defined(ARCH_X86_64) && defined(MAX_STACK_ALLOC) && MAX_STACK_ALLOC > 0 && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
|
33 |
+
// cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746)
|
34 |
+
if(trans && stack_alloc_size)
|
35 |
+
memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size));
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/install-tools.patch
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake
|
2 |
+
index 0c126e3..bb0124b 100644
|
3 |
+
--- a/cmake/prebuild.cmake
|
4 |
+
+++ b/cmake/prebuild.cmake
|
5 |
+
@@ -558,6 +558,8 @@ else(NOT CMAKE_CROSSCOMPILING)
|
6 |
+
if (NOT ${GETARCH_RESULT})
|
7 |
+
MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}")
|
8 |
+
endif ()
|
9 |
+
+
|
10 |
+
+ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" DESTINATION bin)
|
11 |
+
endif ()
|
12 |
+
unset (HAVE_AVX2)
|
13 |
+
unset (HAVE_AVX)
|
14 |
+
@@ -601,6 +603,8 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA
|
15 |
+
if (NOT ${GETARCH2_RESULT})
|
16 |
+
MESSAGE(FATAL_ERROR "Compiling getarch_2nd failed ${GETARCH2_LOG}")
|
17 |
+
endif ()
|
18 |
+
+
|
19 |
+
+ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" DESTINATION bin)
|
20 |
+
endif ()
|
21 |
+
|
22 |
+
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/openblas_common.h
ADDED
@@ -0,0 +1,60 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#pragma once
|
2 |
+
#include "openblas/openblas_config.h"
|
3 |
+
|
4 |
+
#if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX)
|
5 |
+
#define OPENBLAS_WINDOWS_ABI
|
6 |
+
#define OPENBLAS_OS_WINDOWS
|
7 |
+
|
8 |
+
#ifdef DOUBLE
|
9 |
+
#define DOUBLE_DEFINED DOUBLE
|
10 |
+
#undef DOUBLE
|
11 |
+
#endif
|
12 |
+
#endif
|
13 |
+
|
14 |
+
#ifdef NEEDBUNDERSCORE
|
15 |
+
#define BLASFUNC(FUNC) FUNC##_
|
16 |
+
|
17 |
+
#else
|
18 |
+
#define BLASFUNC(FUNC) FUNC
|
19 |
+
#endif
|
20 |
+
|
21 |
+
|
22 |
+
#ifdef OPENBLAS_QUAD_PRECISION
|
23 |
+
typedef struct {
|
24 |
+
unsigned long x[2];
|
25 |
+
} xdouble;
|
26 |
+
#elif defined OPENBLAS_EXPRECISION
|
27 |
+
#define xdouble long double
|
28 |
+
#else
|
29 |
+
#define xdouble double
|
30 |
+
#endif
|
31 |
+
|
32 |
+
#if defined(OS_WINNT) && defined(__64BIT__)
|
33 |
+
typedef long long BLASLONG;
|
34 |
+
typedef unsigned long long BLASULONG;
|
35 |
+
#else
|
36 |
+
typedef long BLASLONG;
|
37 |
+
typedef unsigned long BLASULONG;
|
38 |
+
#endif
|
39 |
+
|
40 |
+
#ifdef OPENBLAS_USE64BITINT
|
41 |
+
typedef BLASLONG blasint;
|
42 |
+
#else
|
43 |
+
typedef int blasint;
|
44 |
+
#endif
|
45 |
+
|
46 |
+
#if defined(XDOUBLE) || defined(DOUBLE)
|
47 |
+
#define FLOATRET FLOAT
|
48 |
+
#else
|
49 |
+
#ifdef NEED_F2CCONV
|
50 |
+
#define FLOATRET double
|
51 |
+
#else
|
52 |
+
#define FLOATRET float
|
53 |
+
#endif
|
54 |
+
#endif
|
55 |
+
|
56 |
+
|
57 |
+
/* Inclusion of a standard header file is needed for definition of __STDC_*
|
58 |
+
predefined macros with some compilers (e.g. GCC 4.7 on Linux). This occurs
|
59 |
+
as a side effect of including either <features.h> or <stdc-predef.h>. */
|
60 |
+
#include <stdio.h>
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/openblas/portfile.cmake
ADDED
@@ -0,0 +1,111 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO xianyi/OpenBLAS
|
4 |
+
REF 2480e5046e3b0120da8a7fd1442eca628df55f87 # v0.3.19
|
5 |
+
SHA512 b85a96c8cd75bf7197732f3b923b8b0ffdc6261d7d6dc7b622d4bf24f061d02273ad99571cabe4686d92f77ff8e6f7e2de0851758cbb3c529d7c2ca96a0bc34d
|
6 |
+
HEAD_REF develop
|
7 |
+
PATCHES
|
8 |
+
uwp.patch
|
9 |
+
fix-space-path.patch
|
10 |
+
fix-redefinition-function.patch
|
11 |
+
fix-uwp-build.patch
|
12 |
+
install-tools.patch
|
13 |
+
)
|
14 |
+
|
15 |
+
find_program(GIT NAMES git git.cmd)
|
16 |
+
|
17 |
+
# sed and awk are installed with git but in a different directory
|
18 |
+
get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY)
|
19 |
+
set(SED_EXE_PATH "${GIT_EXE_PATH}/../usr/bin")
|
20 |
+
|
21 |
+
# openblas require perl to generate .def for exports
|
22 |
+
vcpkg_find_acquire_program(PERL)
|
23 |
+
get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
|
24 |
+
set(PATH_BACKUP "$ENV{PATH}")
|
25 |
+
vcpkg_add_to_path("${PERL_EXE_PATH}")
|
26 |
+
vcpkg_add_to_path("${SED_EXE_PATH}")
|
27 |
+
|
28 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
29 |
+
FEATURES
|
30 |
+
threads USE_THREAD
|
31 |
+
simplethread USE_SIMPLE_THREADED_LEVEL3
|
32 |
+
"dynamic-arch" DYNAMIC_ARCH
|
33 |
+
)
|
34 |
+
|
35 |
+
set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON)
|
36 |
+
|
37 |
+
if(VCPKG_TARGET_IS_OSX)
|
38 |
+
if("dynamic-arch" IN_LIST FEATURES)
|
39 |
+
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
40 |
+
message(STATUS "Openblas with \"dynamic-arch\" option for OSX supports only dynamic linkage. It's not a bag of openblas but bug of combination cmake+ninja+osx. See: https://gitlab.kitware.com/cmake/cmake/-/issues/16731")
|
41 |
+
endif()
|
42 |
+
endif()
|
43 |
+
|
44 |
+
set(OPENBLAS_EXTRA_OPTIONS)
|
45 |
+
# for UWP version, must build non uwp first for helper
|
46 |
+
# binaries.
|
47 |
+
if(VCPKG_TARGET_IS_UWP)
|
48 |
+
list(APPEND OPENBLAS_EXTRA_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64
|
49 |
+
"-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
|
50 |
+
elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW))
|
51 |
+
string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _
|
52 |
+
string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE")
|
53 |
+
list(APPEND OPENBLAS_EXTRA_OPTIONS
|
54 |
+
-DNOFORTRAN=ON
|
55 |
+
-DBU=_ #required for all blas functions to append extra _ using NAME
|
56 |
+
)
|
57 |
+
endif()
|
58 |
+
|
59 |
+
vcpkg_cmake_configure(
|
60 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
61 |
+
OPTIONS
|
62 |
+
${FEATURE_OPTIONS}
|
63 |
+
${COMMON_OPTIONS}
|
64 |
+
${OPENBLAS_EXTRA_OPTIONS}
|
65 |
+
)
|
66 |
+
|
67 |
+
vcpkg_cmake_install()
|
68 |
+
vcpkg_copy_pdbs()
|
69 |
+
|
70 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/OpenBLAS)
|
71 |
+
|
72 |
+
if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
73 |
+
vcpkg_copy_tools(TOOL_NAMES getarch AUTO_CLEAN)
|
74 |
+
endif()
|
75 |
+
if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch_2nd${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
76 |
+
vcpkg_copy_tools(TOOL_NAMES getarch_2nd AUTO_CLEAN)
|
77 |
+
endif()
|
78 |
+
|
79 |
+
set(ENV{PATH} "${PATH_BACKUP}")
|
80 |
+
|
81 |
+
set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openblas.pc")
|
82 |
+
if(EXISTS "${pcfile}")
|
83 |
+
file(READ "${pcfile}" _contents)
|
84 |
+
set(_contents "prefix=${CURRENT_INSTALLED_DIR}\n${_contents}")
|
85 |
+
file(WRITE "${pcfile}" "${_contents}")
|
86 |
+
#file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc" COPY_ON_ERROR)
|
87 |
+
endif()
|
88 |
+
set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/openblas.pc")
|
89 |
+
if(EXISTS "${pcfile}")
|
90 |
+
file(READ "${pcfile}" _contents)
|
91 |
+
set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}")
|
92 |
+
file(WRITE "${pcfile}" "${_contents}")
|
93 |
+
#file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR)
|
94 |
+
endif()
|
95 |
+
vcpkg_fixup_pkgconfig()
|
96 |
+
#maybe we need also to write a wrapper inside share/blas to search implicitly for openblas, whenever we feel it's ready for its own -config.cmake file
|
97 |
+
|
98 |
+
# openblas do not make the config file , so I manually made this
|
99 |
+
# but I think in most case, libraries will not include these files, they define their own used function prototypes
|
100 |
+
# this is only to quite vcpkg
|
101 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/openblas_common.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
102 |
+
|
103 |
+
vcpkg_replace_string(
|
104 |
+
"${SOURCE_PATH}/cblas.h"
|
105 |
+
"#include \"common.h\""
|
106 |
+
"#include \"openblas_common.h\""
|
107 |
+
)
|
108 |
+
|
109 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
110 |
+
|
111 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|