mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 09:30:25 +08:00
MacOS and Windows binaries update (0.23.8) (#1726)
* Windows CI: more sensor drivers + Windows/macOS bundle scripts * added opengv to mac build * windows bundle fixes * zed extra neural ddl in separate package * OpenGV macos eigen version error * opengv macos build issues
This commit is contained in:
matlabbe
21
patches/cccorelib_4095bea.patch
Normal file
21
patches/cccorelib_4095bea.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e671b87..2e2538e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -121,7 +121,7 @@ set( NANOFLANN_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE )
|
||||
set( NANOFLANN_BUILD_TESTS OFF CACHE BOOL "" FORCE )
|
||||
add_subdirectory( extern/nanoflann EXCLUDE_FROM_ALL )
|
||||
target_link_libraries( CCCoreLib
|
||||
- PUBLIC
|
||||
+ PRIVATE
|
||||
nanoflann::nanoflann
|
||||
)
|
||||
|
||||
@@ -236,6 +236,7 @@ install(
|
||||
CCCoreLib
|
||||
EXPORT
|
||||
CCCoreLib-targets
|
||||
+ RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
INCLUDES DESTINATION include
|
||||
102
patches/libfreenect2_v0.2.1.patch
Normal file
102
patches/libfreenect2_v0.2.1.patch
Normal file
@@ -0,0 +1,102 @@
|
||||
diff --git a/freenect2.cmake.in b/freenect2.cmake.in
|
||||
index 05df1af..2195bb4 100644
|
||||
--- a/freenect2.cmake.in
|
||||
+++ b/freenect2.cmake.in
|
||||
@@ -1,10 +1,15 @@
|
||||
+# Resolve paths relative to this config file (<prefix>/lib/cmake/freenect2/) so the
|
||||
+# install tree stays relocatable (e.g. when shipped/unzipped as a prebuilt bundle).
|
||||
+get_filename_component(_freenect2_prefix "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
|
||||
+get_filename_component(_freenect2_prefix "${_freenect2_prefix}" DIRECTORY)
|
||||
+get_filename_component(_freenect2_prefix "${_freenect2_prefix}" DIRECTORY)
|
||||
FIND_LIBRARY(freenect2_LIBRARY freenect2
|
||||
- PATHS @CMAKE_INSTALL_PREFIX@/lib
|
||||
+ PATHS "${_freenect2_prefix}/lib"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
SET(freenect2_LIBRARIES ${freenect2_LIBRARY} @LIBFREENECT2_THREADING_LIBRARIES@)
|
||||
FIND_PATH(freenect2_INCLUDE_DIR @PROJECT_NAME@/libfreenect2.hpp
|
||||
- PATHS @CMAKE_INSTALL_PREFIX@/include
|
||||
+ PATHS "${_freenect2_prefix}/include"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR})
|
||||
diff --git a/src/cuda_depth_packet_processor.cu b/src/cuda_depth_packet_processor.cu
|
||||
index 7ca5974..95c8e11 100644
|
||||
--- a/src/cuda_depth_packet_processor.cu
|
||||
+++ b/src/cuda_depth_packet_processor.cu
|
||||
@@ -779,12 +779,7 @@ public:
|
||||
|
||||
cudaDeviceProp prop;
|
||||
CHECK_CUDA(cudaGetDeviceProperties(&prop, i));
|
||||
- LOG_INFO << "device " << i << ": " << prop.name << " @ " << (prop.clockRate / 1000) << "MHz Memory " << (prop.totalGlobalMem >> 20) << "MB";
|
||||
-
|
||||
- if (prop.computeMode == cudaComputeModeProhibited) {
|
||||
- LOG_INFO << " Compute Mode Prohibited";
|
||||
- continue;
|
||||
- }
|
||||
+ LOG_INFO << "device " << i << ": " << prop.name << " Memory " << (prop.totalGlobalMem >> 20) << "MB";
|
||||
|
||||
if (prop.major < 1) {
|
||||
LOG_INFO << " does not support CUDA";
|
||||
diff --git a/src/cuda_kde_depth_packet_processor.cu b/src/cuda_kde_depth_packet_processor.cu
|
||||
index 0a16f55..bca00cc 100644
|
||||
--- a/src/cuda_kde_depth_packet_processor.cu
|
||||
+++ b/src/cuda_kde_depth_packet_processor.cu
|
||||
@@ -1192,12 +1192,7 @@ public:
|
||||
|
||||
cudaDeviceProp prop;
|
||||
CHECK_CUDA(cudaGetDeviceProperties(&prop, i));
|
||||
- LOG_INFO << "device " << i << ": " << prop.name << " @ " << (prop.clockRate / 1000) << "MHz Memory " << (prop.totalGlobalMem >> 20) << "MB";
|
||||
-
|
||||
- if (prop.computeMode == cudaComputeModeProhibited) {
|
||||
- LOG_INFO << " Compute Mode Prohibited";
|
||||
- continue;
|
||||
- }
|
||||
+ LOG_INFO << "device " << i << ": " << prop.name << " Memory " << (prop.totalGlobalMem >> 20) << "MB";
|
||||
|
||||
if (prop.major < 1) {
|
||||
LOG_INFO << " does not support CUDA";
|
||||
diff --git a/src/opencl_depth_packet_processor.cpp b/src/opencl_depth_packet_processor.cpp
|
||||
index d8db14d..51d0883 100644
|
||||
--- a/src/opencl_depth_packet_processor.cpp
|
||||
+++ b/src/opencl_depth_packet_processor.cpp
|
||||
@@ -251,7 +251,7 @@ public:
|
||||
newIrFrame();
|
||||
newDepthFrame();
|
||||
|
||||
- const int CL_ICDL_VERSION = 2;
|
||||
+ const int clIcdlVersion = 2;
|
||||
typedef cl_int (*icdloader_func)(int, size_t, void*, size_t*);
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
@@ -269,7 +269,7 @@ public:
|
||||
if (clGetICDLoaderInfoOCLICD != NULL)
|
||||
{
|
||||
char buf[16];
|
||||
- if (clGetICDLoaderInfoOCLICD(CL_ICDL_VERSION, sizeof(buf), buf, NULL) == CL_SUCCESS)
|
||||
+ if (clGetICDLoaderInfoOCLICD(clIcdlVersion, sizeof(buf), buf, NULL) == CL_SUCCESS)
|
||||
{
|
||||
if (strcmp(buf, "2.2.4") < 0 && strlen(buf) <= 5)
|
||||
LOG_WARNING << "Your ocl-icd has deadlock bugs. Update to 2.2.4+ is recommended.";
|
||||
diff --git a/src/opencl_kde_depth_packet_processor.cpp b/src/opencl_kde_depth_packet_processor.cpp
|
||||
index 98dbdff..97fbc6d 100644
|
||||
--- a/src/opencl_kde_depth_packet_processor.cpp
|
||||
+++ b/src/opencl_kde_depth_packet_processor.cpp
|
||||
@@ -259,7 +259,7 @@ public:
|
||||
newIrFrame();
|
||||
newDepthFrame();
|
||||
|
||||
- const int CL_ICDL_VERSION = 2;
|
||||
+ const int clIcdlVersion = 2;
|
||||
typedef cl_int (*icdloader_func)(int, size_t, void*, size_t*);
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
@@ -277,7 +277,7 @@ public:
|
||||
if (clGetICDLoaderInfoOCLICD != NULL)
|
||||
{
|
||||
char buf[16];
|
||||
- if (clGetICDLoaderInfoOCLICD(CL_ICDL_VERSION, sizeof(buf), buf, NULL) == CL_SUCCESS)
|
||||
+ if (clGetICDLoaderInfoOCLICD(clIcdlVersion, sizeof(buf), buf, NULL) == CL_SUCCESS)
|
||||
{
|
||||
if (strcmp(buf, "2.2.4") < 0)
|
||||
LOG_WARNING << "Your ocl-icd has deadlock bugs. Update to 2.2.4+ is recommended.";
|
||||
29
patches/orbbecsdk_2.8.7.patch
Normal file
29
patches/orbbecsdk_2.8.7.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 261f2cda..644e068f 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -92,17 +92,20 @@ if(OB_IS_MAIN_PROJECT)
|
||||
)
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/generated/Export.h" DESTINATION include/libobsensor/h)
|
||||
- install(EXPORT ${OB_SDK_LIB_NAME}Config NAMESPACE ob:: DESTINATION lib)
|
||||
+ install(EXPORT ${OB_SDK_LIB_NAME}Config NAMESPACE ob:: DESTINATION lib/cmake/${OB_SDK_LIB_NAME})
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
+ # Name the version file <pkg>ConfigVersion.cmake (not <pkg>Version.cmake) and
|
||||
+ # install it next to the config in lib/cmake/<pkg>, so find_package(OrbbecSDK)
|
||||
+ # discovers it in config mode and reads its version.
|
||||
write_basic_package_version_file(
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${OB_SDK_LIB_NAME}Version.cmake"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/${OB_SDK_LIB_NAME}ConfigVersion.cmake"
|
||||
VERSION "${PROJECT_VERSION}"
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
install(
|
||||
- FILES "${CMAKE_CURRENT_BINARY_DIR}/${OB_SDK_LIB_NAME}Version.cmake"
|
||||
- DESTINATION lib
|
||||
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/${OB_SDK_LIB_NAME}ConfigVersion.cmake"
|
||||
+ DESTINATION lib/cmake/${OB_SDK_LIB_NAME}
|
||||
)
|
||||
if(MSVC)
|
||||
install(FILES $<TARGET_PDB_FILE:${OB_SDK_LIB_NAME}> DESTINATION bin OPTIONAL)
|
||||
Reference in New Issue
Block a user