Merge pull request #491 from codedownio/extra-setup-0.15.2

Extra setup from cling.cpp
jupyter-xeus · Jul 21, 2023 · cdaaadd · cdaaadd
2 parents c13e660 + 0019bfa
commit cdaaadd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/include/xeus-cling/xinterpreter.hpp b/include/xeus-cling/xinterpreter.hpp
@@ -72,6 +72,7 @@ namespace xcpp
         void restore_output();
 
         void init_extra_includes();
+        void init_libs();
         void init_preamble();
         void init_magic();
 

diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp
@@ -60,6 +60,7 @@ namespace xcpp
     {
         redirect_output();
         init_extra_includes();
+        init_libs();
         init_preamble();
         init_magic();
     }
@@ -434,6 +435,15 @@ namespace xcpp
         m_interpreter.AddIncludePaths(XEUS_SEARCH_PATH);
     }
 
+    void interpreter::init_libs()
+    {
+        const cling::InvocationOptions& Opts = m_interpreter.getOptions();
+        for (const std::string& Lib : Opts.LibsToLoad)
+        {
+            m_interpreter.loadFile(Lib);
+        }
+    }
+
     void interpreter::init_preamble()
     {
         preamble_manager.register_preamble("introspection", new xintrospection(m_interpreter));