Merge branch 'main' into const-get-root-tile

Author: j9liu

.github/workflows/build.yml

@@ -49,9 +49,9 @@ jobs:
       # and using them ensures we're compiling our plugin in the exact same way that Unreal Engine itself is compiled.
       cmake-generator: "Visual Studio 17 2022"
       cmake-toolchain: "version=14.34"
-      cmake-platform: "x64,version=10.0.18362.0"
+      cmake-platform: "x64,version=10.0.19041.0"
       visual-studio-version: "2022"
-      visual-studio-components: "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64,Microsoft.VisualStudio.Component.Windows10SDK.18362"
+      visual-studio-components: "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64,Microsoft.VisualStudio.Component.Windows10SDK.19041"
   TestWindows54:
     needs: [Windows54]
     uses: ./.github/workflows/testWindows.yml

CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log {#changes}
 
+### ???
+
+##### Fixes :wrench:
+
+- Added a missing `CesiumRuntime.h` include in `CesiumPropertyAttribute.cpp` that broke compilation in v2.18.0 on Windows.
+
 ### v2.18.0 - 2025-08-01
 
 ##### Breaking Changes :mega:

Source/CesiumRuntime/Private/CesiumPropertyAttribute.cpp

@@ -1,6 +1,7 @@
 // Copyright 2020-2024 CesiumGS, Inc. and Contributors
 
 #include "CesiumPropertyAttribute.h"
+#include "CesiumRuntime.h"
 #include <CesiumGltf/PropertyAttributeView.h>
 
 static FCesiumPropertyAttributeProperty EmptyPropertyAttributeProperty;

extern/CMakeLists.txt

@@ -11,12 +11,17 @@ if (DEFINED ENV{UNREAL_ENGINE_ROOT} AND NOT UNREAL_ENGINE_ROOT)
 endif()
 
 if (NOT UNREAL_ENGINE_ROOT)
-  # On Windows, try to use the default UE 5.4 location
-  set(WINDOWS_DEFAULT_UNREAL_INSTALLATION "C:/Program Files/Epic Games/UE_5.4")
-  if (WIN32 AND EXISTS "${WINDOWS_DEFAULT_UNREAL_INSTALLATION}")
-    set(UNREAL_ENGINE_ROOT "${WINDOWS_DEFAULT_UNREAL_INSTALLATION}")
+  # On Windows and Mac, try to use the default UE 5.4 location
+  if (WIN32)
+     set(DEFAULT_UNREAL_INSTALLATION "C:/Program Files/Epic Games/UE_5.4")
+  elseif(APPLE)
+    set(DEFAULT_UNREAL_INSTALLATION "/Users/Shared/Epic Games/UE_5.4")
+  endif()
+
+  if (NOT EXISTS "${DEFAULT_UNREAL_INSTALLATION}")
+     message(FATAL_ERROR "Please specify the root of your Unreal Engine installation, either by setting the UNREAL_ENGINE_ROOT environment variable or with -DUNREAL_ENGINE_ROOT=path on the cmake command-line.")
   else()
-    message(FATAL_ERROR "Please specify the root of your Unreal Engine installation, either by setting the UNREAL_ENGINE_ROOT environment variable or with -DUNREAL_ENGINE_ROOT=path on the cmake command-line.")
+    set(UNREAL_ENGINE_ROOT "${DEFAULT_UNREAL_INSTALLATION}")
   endif()
 endif()