From 1dd7194865e812fce52646f018c32d80304550eb Mon Sep 17 00:00:00 2001 From: Kevin Ring Date: Fri, 16 Aug 2024 14:55:20 +1000 Subject: [PATCH] Exclude openssl from native installation, rather than from build. --- Source/CesiumEditor/CesiumEditor.Build.cs | 4 ---- Source/CesiumRuntime/CesiumRuntime.Build.cs | 4 ---- extern/CMakeLists.txt | 4 ++++ extern/cesium-native | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/CesiumEditor/CesiumEditor.Build.cs b/Source/CesiumEditor/CesiumEditor.Build.cs index 965ebdcda..a100ee757 100644 --- a/Source/CesiumEditor/CesiumEditor.Build.cs +++ b/Source/CesiumEditor/CesiumEditor.Build.cs @@ -73,10 +73,6 @@ public CesiumEditor(ReadOnlyTargetRules Target) : base(Target) string[] allLibs = Directory.GetFiles(libPath, libSearchPattern); - // Remove libssl and libcrypto because these come from Unreal Engine itself - // TODO: Exclude these from the cesium-native side instead of excluding them here. - allLibs = allLibs.Where(l => !l.Contains("libssl") && !l.Contains("libcrypto")).ToArray(); - PublicAdditionalLibraries.AddRange(allLibs); PublicDependencyModuleNames.AddRange( diff --git a/Source/CesiumRuntime/CesiumRuntime.Build.cs b/Source/CesiumRuntime/CesiumRuntime.Build.cs index a1cfa1945..fb9ee0fe8 100644 --- a/Source/CesiumRuntime/CesiumRuntime.Build.cs +++ b/Source/CesiumRuntime/CesiumRuntime.Build.cs @@ -72,10 +72,6 @@ public CesiumRuntime(ReadOnlyTargetRules Target) : base(Target) string[] allLibs = Directory.GetFiles(libPath, libSearchPattern); - // Remove libssl and libcrypto because these come from Unreal Engine itself - // TODO: Exclude these from the cesium-native side instead of excluding them here. - allLibs = allLibs.Where(l => !l.Contains("libssl") && !l.Contains("libcrypto")).ToArray(); - PublicAdditionalLibraries.AddRange(allLibs); PublicDependencyModuleNames.AddRange( diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index d1bf56861..5fce667b1 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -121,6 +121,10 @@ if (NOT VCPKG_TRIPLET) endif() endif() +# Our OpenSSL is part of Unreal Engine, so need to install it. +set(CESIUM_EXCLUDE_INSTALL_HEADERS openssl) +set(CESIUM_EXCLUDE_INSTALL_STATIC_LIBS openssl) + add_subdirectory(cesium-native) # cesium-native doesn't require this header to be public, but Cesium for Unreal wants to use it. diff --git a/extern/cesium-native b/extern/cesium-native index b1d7da479..3b3643517 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit b1d7da4795ee01bcbec58353a75bf72d3a3d4596 +Subproject commit 3b364351795b4c60d58f3ddba16526c56c317c9a