Exclude openssl from native installation, rather than from build.

CesiumGS · Aug 16, 2024 · 1dd7194 · 1dd7194
1 parent fc4ff10
commit 1dd7194
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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