From fde22f8f1c6ed136593b6e10818e4a5444cb6598 Mon Sep 17 00:00:00 2001
From: ferdymercury <ferdymercury@users.noreply.github.com>
Date: Fri, 29 May 2026 09:39:25 +0200
Subject: [PATCH 1/2] [webgui] move builtins to subdir for consistency

---
 builtins/mathjax/CMakeLists.txt             | 10 +++++
 builtins/openui5/CMakeLists.txt             | 24 +++++++++++
 builtins/rendercore/CMakeLists.txt          | 11 +++++
 cmake/modules/SearchInstalledSoftware.cmake | 48 ++-------------------
 4 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 builtins/mathjax/CMakeLists.txt
 create mode 100644 builtins/openui5/CMakeLists.txt
 create mode 100644 builtins/rendercore/CMakeLists.txt

diff --git a/builtins/mathjax/CMakeLists.txt b/builtins/mathjax/CMakeLists.txt
new file mode 100644
index 0000000000000..9b020e9e916ae
--- /dev/null
+++ b/builtins/mathjax/CMakeLists.txt
@@ -0,0 +1,10 @@
+ExternalProject_Add(
+   MATHJAX
+   URL ${CMAKE_SOURCE_DIR}/documentation/doxygen/mathjax.tar.gz # TODO move to LCG
+   URL_HASH SHA256=c5e22e60430a65963a87ab4dcc8856b9be5bd434d3b3871f27ee65b584c3c3ea
+   CONFIGURE_COMMAND ""
+   BUILD_COMMAND ""
+   INSTALL_COMMAND ""
+   SOURCE_DIR ${CMAKE_BINARY_DIR}/js/mathjax/
+   TIMEOUT 600
+)
diff --git a/builtins/openui5/CMakeLists.txt b/builtins/openui5/CMakeLists.txt
new file mode 100644
index 0000000000000..7bc291b16246c
--- /dev/null
+++ b/builtins/openui5/CMakeLists.txt
@@ -0,0 +1,24 @@
+if(builtin_openui5)
+  ExternalProject_Add(
+    OPENUI5
+    URL ${CMAKE_SOURCE_DIR}/builtins/openui5/openui5.tar.gz # TODO move to LCG
+    URL_HASH SHA256=b9e6495d8640302d9cf2fe3c99331311335aaab0f48794565ebd69ecc7449e58
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/distribution
+    TIMEOUT 600
+  )
+else()
+  ExternalProject_Add(
+    OPENUI5
+    URL https://github.com/SAP/openui5/releases/download/1.135.0/openui5-runtime-1.135.0.zip
+    URL_HASH SHA256=13acdb88a7f3f1d4afef6d1d500b53bccc4b593e7acf442721bb4e3da4e2690b
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/distribution
+    TIMEOUT 600
+  )
+endif()
+install(DIRECTORY ${CMAKE_BINARY_DIR}/ui5/distribution/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}/distribution/ COMPONENT libraries FILES_MATCHING PATTERN "*")
diff --git a/builtins/rendercore/CMakeLists.txt b/builtins/rendercore/CMakeLists.txt
new file mode 100644
index 0000000000000..645579ce242b2
--- /dev/null
+++ b/builtins/rendercore/CMakeLists.txt
@@ -0,0 +1,11 @@
+ExternalProject_Add(
+  RENDERCORE
+  URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-2.0.tar.gz # TODO move to LCG
+  URL_HASH SHA256=6bdcf70fbdec1f950057ab1df722775c468ad6894f8a364f15f589d58c326667
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/eve7/rcore
+  TIMEOUT 600
+)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/ui5/eve7/rcore/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}/eve7/rcore/ COMPONENT libraries FILES_MATCHING PATTERN "*")
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
index fb3ba29c6804a..10a34e573239e 100644
--- a/cmake/modules/SearchInstalledSoftware.cmake
+++ b/cmake/modules/SearchInstalledSoftware.cmake
@@ -1594,52 +1594,10 @@ if(webgui)
      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
         $ENV{OPENUI5DIR} ${CMAKE_BINARY_DIR}/ui5/distribution)
   else()
-    if(builtin_openui5)
-      ExternalProject_Add(
-        OPENUI5
-        URL ${CMAKE_SOURCE_DIR}/builtins/openui5/openui5.tar.gz
-        URL_HASH SHA256=b9e6495d8640302d9cf2fe3c99331311335aaab0f48794565ebd69ecc7449e58
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/distribution
-        TIMEOUT 600
-      )
-    else()
-      ExternalProject_Add(
-        OPENUI5
-        URL https://github.com/SAP/openui5/releases/download/1.135.0/openui5-runtime-1.135.0.zip
-        URL_HASH SHA256=13acdb88a7f3f1d4afef6d1d500b53bccc4b593e7acf442721bb4e3da4e2690b
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/distribution
-        TIMEOUT 600
-      )
-    endif()
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/ui5/distribution/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}/distribution/ COMPONENT libraries FILES_MATCHING PATTERN "*")
+    add_subdirectory(builtins/openui5)
   endif()
-  ExternalProject_Add(
-    RENDERCORE
-    URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-2.0.tar.gz
-    URL_HASH SHA256=6bdcf70fbdec1f950057ab1df722775c468ad6894f8a364f15f589d58c326667
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/ui5/eve7/rcore
-    TIMEOUT 600
-  )
-  ExternalProject_Add(
-     MATHJAX
-     URL ${CMAKE_SOURCE_DIR}/documentation/doxygen/mathjax.tar.gz
-     URL_HASH SHA256=c5e22e60430a65963a87ab4dcc8856b9be5bd434d3b3871f27ee65b584c3c3ea
-     CONFIGURE_COMMAND ""
-     BUILD_COMMAND ""
-     INSTALL_COMMAND ""
-     SOURCE_DIR ${CMAKE_BINARY_DIR}/js/mathjax/
-     TIMEOUT 600
-  )
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/ui5/eve7/rcore/ DESTINATION ${CMAKE_INSTALL_OPENUI5DIR}/eve7/rcore/ COMPONENT libraries FILES_MATCHING PATTERN "*")
+  add_subdirectory(builtins/rendercore)
+  add_subdirectory(builtins/mathjax)
 endif()
 
 #------------------------------------------------------------------------------------

From 1c0e39a1762130e844f629e0567eae7e46dcbbe8 Mon Sep 17 00:00:00 2001
From: ferdymercury <ferdymercury@users.noreply.github.com>
Date: Fri, 29 May 2026 11:49:32 +0200
Subject: [PATCH 2/2] [net,graf] cleanup target uses

---
 graf2d/graf/CMakeLists.txt     | 2 --
 graf2d/win32gdk/CMakeLists.txt | 2 --
 net/http/CMakeLists.txt        | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt
index f7a0f9703723e..da2585cb59fc2 100644
--- a/graf2d/graf/CMakeLists.txt
+++ b/graf2d/graf/CMakeLists.txt
@@ -96,6 +96,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
     Matrix
     MathCore
     RIO
-  BUILTINS
-    FREETYPE
 )
diff --git a/graf2d/win32gdk/CMakeLists.txt b/graf2d/win32gdk/CMakeLists.txt
index 66e3967cec63b..74046e3e13a40 100644
--- a/graf2d/win32gdk/CMakeLists.txt
+++ b/graf2d/win32gdk/CMakeLists.txt
@@ -123,8 +123,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Win32gdk
   DEPENDENCIES
     Core
     Graf
-  BUILTINS
-    FREETYPE
 )
 
 target_include_directories(Win32gdk PRIVATE ../gifencode)
diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt
index f05d568a01177..5c8e81346399a 100644
--- a/net/http/CMakeLists.txt
+++ b/net/http/CMakeLists.txt
@@ -63,7 +63,7 @@ if(builtin_civetweb)
    target_include_directories(RHTTP PRIVATE civetweb)
 
   if(ssl)
-    target_include_directories(RHTTP SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+    target_link_libraries(RHTTP PRIVATE OpenSSL::SSL)
   endif()
 
   target_compile_definitions(RHTTP PRIVATE -DUSE_WEBSOCKET)