From 4d26656b4d8ee4c556cf376a487dd2bdd9cf5ff6 Mon Sep 17 00:00:00 2001 From: Diana Perez Afanador Date: Fri, 6 Oct 2023 14:38:53 +0200 Subject: [PATCH] Enable `REALM_ENABLE_GEOSPATIAL`, geoWithin on points for SPM Installation (#7032) --- Package.swift | 6 +++--- tools/build-cocoa.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 66486234dda..2a7e96de48a 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ var cxxSettings: [CXXSetting] = [ .define("REALM_ENABLE_ASSERTIONS", to: "1"), .define("REALM_ENABLE_ENCRYPTION", to: "1"), .define("REALM_ENABLE_SYNC", to: "1"), - .define("REALM_ENABLE_GEOSPATIAL", to: "0"), + .define("REALM_ENABLE_GEOSPATIAL", to: "1"), .define("REALM_VERSION_MAJOR", to: String(versionCompontents[0])), .define("REALM_VERSION_MINOR", to: String(versionCompontents[1])), @@ -71,6 +71,7 @@ let notSyncServerSources: [String] = [ "realm/disable_sync_to_disk.cpp", "realm/error_codes.cpp", "realm/exceptions.cpp", + "realm/geospatial.cpp", "realm/global_key.cpp", "realm/group.cpp", "realm/group_writer.cpp", @@ -395,14 +396,13 @@ let package = Package( ] + cxxSettings) as [CXXSetting]), .target( name: "RealmCore", - dependencies: ["Bid"], + dependencies: ["Bid", "s2geometry"], path: "src", exclude: ([ "CMakeLists.txt", "external", "realm/CMakeLists.txt", "realm/exec", - "realm/geospatial.cpp", "realm/object-store/CMakeLists.txt", "realm/object-store/c_api", "realm/object-store/impl/epoll", diff --git a/tools/build-cocoa.sh b/tools/build-cocoa.sh index e492cda81a3..8e020ee6b1b 100755 --- a/tools/build-cocoa.sh +++ b/tools/build-cocoa.sh @@ -54,7 +54,7 @@ if [[ -n $BUILD ]]; then -D CMAKE_SYSTEM_NAME=Darwin \ -D REALM_VERSION="${VERSION}" \ -D REALM_BUILD_LIB_ONLY=ON \ - -D REALM_ENABLE_GEOSPATIAL=OFF \ + -D REALM_ENABLE_GEOSPATIAL=ON \ -D CPACK_SYSTEM_NAME=macosx \ -D CPACK_PACKAGE_DIRECTORY=.. \ -D CMAKE_OSX_ARCHITECTURES='x86_64;arm64' \