Skip to content

Commit cbdc960

Browse files
committed
[cmake] enable/disable jsroot in jupyter #20450
Now jsroot functionality in jupyter depends on TWebCanvas functionality. But it is not compiled when -Dwebgui=off is configured. So change default notebook behavior depending on that configuration Resolves #20450
1 parent f4c8a7f commit cbdc960

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cmake/modules/RootConfiguration.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,12 @@ if(webgui)
526526
set(root_canvas_class "TWebCanvas")
527527
set(root_treeviewer_class "RTreeViewer")
528528
set(root_geompainter_type "web")
529+
set(root_jupyter_jsroot "on")
529530
else()
530531
set(root_canvas_class "TRootCanvas")
531532
set(root_treeviewer_class "TTreeViewer")
532533
set(root_geompainter_type "root")
534+
set(root_jupyter_jsroot "off")
533535
endif()
534536

535537
if(root7 AND webgui)

config/rootrc.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ GeomPainter.Name: @root_geompainter_type@
242242
# THttpServer specific settings
243243
# location of JavaScript ROOT sources
244244
#HttpServ.JSRootPath: @jsrootdir@
245-
# Default setting for enabling or disabling JSROOT.
245+
# Default setting for enabling or disabling JSROOT.
246246
# This can be toggled in the notebook using the `%jsroot on/off` command.
247-
Jupyter.JSRoot: on
247+
Jupyter.JSRoot: @root_jupyter_jsroot@
248248

249249
# WebGui specific settings (defaults are shown)
250250
# fixed http port number for server, 0 - not fixed, -1 - disabled completely

0 commit comments

Comments
 (0)