mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-01 17:10:26 +08:00
iOS CI (#1722)
* iOS CI * g2o hard-coded path * bump ios version * Fixed opencv 4.10.0 build on docker resolute
This commit is contained in:
@@ -1065,7 +1065,7 @@
|
||||
"$(PROJECT_DIR)/RTABMapApp/Libraries/share/OpenCV/3rdparty/lib",
|
||||
"$(PROJECT_DIR)/RTABMapApp/Libraries/lib/opencv4/3rdparty",
|
||||
);
|
||||
MARKETING_VERSION = 0.22.0;
|
||||
MARKETING_VERSION = 0.23.7;
|
||||
OTHER_CFLAGS = "";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.introlab.rtabmap;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
@@ -1125,7 +1125,7 @@
|
||||
"$(PROJECT_DIR)/RTABMapApp/Libraries/share/OpenCV/3rdparty/lib",
|
||||
"$(PROJECT_DIR)/RTABMapApp/Libraries/lib/opencv4/3rdparty",
|
||||
);
|
||||
MARKETING_VERSION = 0.22.0;
|
||||
MARKETING_VERSION = 0.23.7;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
OTHER_CFLAGS = "";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.introlab.rtabmap;
|
||||
|
||||
@@ -175,6 +175,18 @@ cd $pwd
|
||||
#rm -rf g2o
|
||||
fi
|
||||
|
||||
# g2o's installed CMake config hard-codes the absolute build-time prefix of its
|
||||
# external dependencies (e.g. suitesparse) in INTERFACE_INCLUDE_DIRECTORIES. That
|
||||
# path doesn't exist when the prebuilt Libraries archive is unpacked on another
|
||||
# machine (CI), breaking find_package(g2o) with "includes non-existent path".
|
||||
# Rewrite those absolute paths to be relocatable (relative to the config file).
|
||||
# Run unconditionally (outside the build guard above) so it also fixes the prebuilt
|
||||
# archive in CI, where the g2o build step is skipped.
|
||||
find "$prefix/lib" -path '*/cmake/g2o/*.cmake' -print0 | while IFS= read -r -d '' f
|
||||
do
|
||||
sed -i '' -E 's#[^";]*/Libraries#${CMAKE_CURRENT_LIST_DIR}/../../..#g' "$f"
|
||||
done
|
||||
|
||||
# VTK
|
||||
if [ ! -e $prefix/lib/vtk.framework ]
|
||||
then
|
||||
|
||||
Reference in New Issue
Block a user