Skip to content

[webgui,net,graf] move builtins to subdir for consistency #22426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ferdymercury wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[webgui,net,graf] move builtins to subdir for consistency #22426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde22f8
[webgui] move builtins to subdir for consistency
ferdymercury May 29, 2026
1c0e39a
[net,graf] cleanup target uses
ferdymercury May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions builtins/mathjax/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
24 changes: 24 additions & 0 deletions builtins/openui5/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "*")
11 changes: 11 additions & 0 deletions builtins/rendercore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "*")
48 changes: 3 additions & 45 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

#------------------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions graf2d/graf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf
Matrix
MathCore
RIO
BUILTINS
FREETYPE
)
2 changes: 0 additions & 2 deletions graf2d/win32gdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Win32gdk
DEPENDENCIES
Core
Graf
BUILTINS
FREETYPE
)

target_include_directories(Win32gdk PRIVATE ../gifencode)
Expand Down
2 changes: 1 addition & 1 deletion net/http/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading