Skip to content

Find Spatial in spatial/, falling back to reactvisioncca/ #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doranteseduardo merged 1 commit into from
Oct 30, 2026
Merged

Find Spatial in spatial/, falling back to reactvisioncca/ #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions android/sharedCode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,15 @@ set_target_properties( lib-LinearMath
# before building ViroCore. It is OPTIONAL: open-source builds without the .so
# compile stub implementations that report the feature as unavailable.
#
# To enable: run reactvisioncca/scripts/build_android.sh and copy the .so files
# To enable: run spatial/scripts/build_android.sh and copy the .so files
# to android/sharedCode/src/main/jniLibs/{abi}/ before building ViroCore.
# The sibling checkout is spatial/ (the repo's name); reactvisioncca/ is the
# folder's old name, still found so a checkout that kept it keeps building.

set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../reactvisioncca")
set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../spatial")
if(NOT EXISTS "${RVCCA_DIR}/include" AND EXISTS "${CMAKE_SOURCE_DIR}/../../../reactvisioncca/include")
set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../reactvisioncca")
endif()
set(RVCCA_SO "${VIRO_ANDROID_LIBS}/${ANDROID_ABI}/libreactvisioncca.so")
set(RVCCA_HDR "${RVCCA_DIR}/include/ReactVisionCCA/RVCCACloudAnchorProvider.h")

Expand Down
4 changes: 2 additions & 2 deletions ios/ViroKit/VROCloudAnchorProviderReactVision.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
// Detect ReactVisionCCA availability at compile time.
// The build_ios.sh script deploys libreactvisioncca.a to
// virocore/ios/Libraries/reactvisioncca/{arch}/
// and the headers live in reactvisioncca/include/ (sibling repo).
// HEADER_SEARCH_PATHS includes $(SRCROOT)/../../reactvisioncca/include so
// and the headers live in spatial/include/ (sibling repo; reactvisioncca/ is its old name).
// HEADER_SEARCH_PATHS includes $(SRCROOT)/../../spatial/include (and the old name) so
// __has_include returns true only when the SDK is actually present.
#if __has_include("ReactVisionCCA/RVCCACloudAnchorProvider.h")
# define RVCCA_AVAILABLE 1
Expand Down
2 changes: 2 additions & 0 deletions ios/ViroRenderer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5696,6 +5696,7 @@
"$(SRCROOT)/Libraries/bullet/include",
"$(SRCROOT)/Libraries/harfbuzz/include",
"$(SRCROOT)/../ViroRenderer/",
"$(SRCROOT)/../../spatial/include",
"$(SRCROOT)/../../reactvisioncca/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand Down Expand Up @@ -5757,6 +5758,7 @@
"$(SRCROOT)/Libraries/bullet/include",
"$(SRCROOT)/Libraries/harfbuzz/include",
"$(SRCROOT)/../ViroRenderer/",
"$(SRCROOT)/../../spatial/include",
"$(SRCROOT)/../../reactvisioncca/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand Down
2 changes: 1 addition & 1 deletion ios/build_visionos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ VENDORED_LIBS=(
"bullet/%s/libLinearMath.a"
"bullet/%s/libBulletCollision.a"
"bullet/%s/libBulletDynamics.a"
# ReactVisionCCA, built by reactvisioncca/scripts/build_ios.sh with RVCCA_BUILD_VISIONOS=1.
# Spatial (libreactvisioncca), built by spatial/scripts/build_ios.sh with RVCCA_BUILD_VISIONOS=1.
# Not optional here the way it is on iOS: VROColocationSession.o lives in this target and is
# pulled into every link by -ObjC, so without these slices an app fails to link on a symbol
# it never asked for.
Expand Down
Loading