[JupyROOT] Use CMAKE_INSTALL_JSROOTDIR to find installed JSROOT

evheniyt · Aug 14, 2020 · 9dd6511 · 9dd6511
1 parent ed0b51e
commit 9dd6511
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/etc/notebook/jupyter_notebook_config.py.in b/etc/notebook/jupyter_notebook_config.py.in
@@ -3,5 +3,5 @@ if 'ROOTSYS' in os.environ:
     # Prefer using JSROOT from ROOTSYS if defined
     c.NotebookApp.extra_static_paths.append(os.path.join(os.environ['ROOTSYS'], 'js/'))
 else:
-    # Fall back to CMAKE_INSTALL_PREFIX to find JSROOT
-    c.NotebookApp.extra_static_paths.append(os.path.join("@CMAKE_INSTALL_PREFIX@", 'js/'))
+    # Fall back to CMAKE_INSTALL_PREFIX/CMAKE_INSTALL_JSROOTDIR, e.g., for a system installation
+    c.NotebookApp.extra_static_paths.append(os.path.join("@CMAKE_INSTALL_PREFIX@", "@CMAKE_INSTALL_JSROOTDIR@"))