From e2411f7c95aa23ec490be856b53443069da2ee71 Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Thu, 7 Nov 2024 09:19:36 +1100 Subject: [PATCH] Fix non-Android errors. This is a bit dodgy, because our modified Abseil is now pretending to be the real deal. But I haven't worked out how to fix that without introducing linker errors yet. --- Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h | 4 ++-- extern/vcpkg-overlays/abseil/portfile.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h b/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h index f6595478d..932eebd6d 100644 --- a/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h +++ b/Source/CesiumRuntime/Private/Tests/CesiumTestHelpers.h @@ -193,9 +193,9 @@ template T* findInPlay(T* pEditorObject) { if (!pPlayOwner) return nullptr; return getComponentWithTag(pPlayOwner, getUniqueTag(pEditorObject)); + } else { + return nullptr; } - - return nullptr; } /// diff --git a/extern/vcpkg-overlays/abseil/portfile.cmake b/extern/vcpkg-overlays/abseil/portfile.cmake index 02df116ea..77896d463 100644 --- a/extern/vcpkg-overlays/abseil/portfile.cmake +++ b/extern/vcpkg-overlays/abseil/portfile.cmake @@ -51,9 +51,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() # Don't let our customized version of Abseil pose as the real thing. -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/options.h" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722_cesium_for_unreal") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "#define ABSL_LTS_RELEASE_VERSION 20240722" "//#define ABSL_LTS_RELEASE_VERSION 20240722") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "#define ABSL_LTS_RELEASE_PATCH_LEVEL 0" "//#define ABSL_LTS_RELEASE_PATCH_LEVEL 0") +# vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/options.h" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722_cesium_for_unreal") +# vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "#define ABSL_LTS_RELEASE_VERSION 20240722" "//#define ABSL_LTS_RELEASE_VERSION 20240722") +# vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "#define ABSL_LTS_RELEASE_PATCH_LEVEL 0" "//#define ABSL_LTS_RELEASE_PATCH_LEVEL 0") # Apply this patch to fix C++20 build with Android NDK r25 # https://github.com/abseil/abseil-cpp/pull/1728