Skip to content

[x3d] mv to builtin subdir for consistency #23138

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

Merged
linev merged 5 commits into from
Aug 25, 2026
Merged

[x3d] mv to builtin subdir for consistency #23138

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6f5b8c
[x3d] mv to builtin subdir for consistency
ferdymercury Aug 24, 2026
4072284
Update CMakeLists.txt
ferdymercury Aug 24, 2026
ca92ac3
Update CMakeLists.txt
ferdymercury Aug 24, 2026
90f465e
[cmake] do not split CMakeLists for X3d
ferdymercury Aug 25, 2026
a04cfc0
[cmake] restore comments
ferdymercury Aug 25, 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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ if (opengl)
add_subdirectory (builtins/glad) # hard coded builtin for graf3d
endif()
add_subdirectory (graf3d)
if(NOT WIN32 AND x11)
add_subdirectory (builtins/x3d) # hard coded builtin for graf3d on Unix with x11
endif()
if(NOT minimal)
add_subdirectory (gui)
else()
Expand Down
6 changes: 6 additions & 0 deletions builtins/x3d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This was forked in 1993 and slightly adapted for ROOT. See
# https://github.com/root-project/root/blob/852600061bcacd9b255d44f6312c96b6b1e00a2d/x3d/inc/x3d.h
# https://github.com/root-project/root/blob/852600061bcacd9b255d44f6312c96b6b1e00a2d/x3d/src/x3d.c
# vs http://hpux.connect.org.uk/hppd/hpux/X11/Viewers/x3d-2.2/ download source and rename from .tar.gz to just .tar

target_sources(X3d PRIVATE x3d.h x3d.c)
0 graf3d/x3d/src/x3d.c → builtins/x3d/x3d.c
View file
Open in desktop
File renamed without changes.
0 graf3d/x3d/src/x3d.h → builtins/x3d/x3d.h
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion documentation/doxygen/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ EXCLUDE = ../../interpreter/ \
../../core/newdelete/ \
../../core/textinput/ \
../../builtins/ \
../../graf3d/x3d/ \
../../documentation/doxygen/html

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
Expand Down
3 changes: 1 addition & 2 deletions graf3d/x3d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(X3d
TViewerX3D.h
TX3DFrame.h
SOURCES
src/x3d.c
src/TViewerX3D.cxx
src/TX3DFrame.cxx
LIBRARIES
Expand All @@ -23,4 +22,4 @@ ROOT_STANDARD_LIBRARY_PACKAGE(X3d
Gui
)

target_include_directories(X3d PRIVATE ${X11_INCLUDE_DIR})
target_include_directories(X3d PRIVATE ${X11_INCLUDE_DIR} src/) # src for x3d builtin
Loading