Merge xeus-clang-repl mini - new kernels (#58)

* Add new kernel configuration logic

* Reduce using file(GLOB) in kernels config

Author: alexander-penev

CMakeLists.txt

@@ -126,13 +126,34 @@ if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
     set(XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/")
 endif ()
 
-set(XEUS_CPP_PATH "$ENV{PATH}")
-set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
-set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CppInterOp_CLANG_VERSION})
-configure_file (
-    "${CMAKE_CURRENT_SOURCE_DIR}/share/jupyter/kernels/xcpp/kernel.json.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/share/jupyter/kernels/xcpp/kernel.json"
-)
+function(configure_kernel kernel)
+  set(XEUS_CPP_PATH "$ENV{PATH}")
+  set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
+  set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CppInterOp_CLANG_VERSION})
+
+  configure_file (
+    "${CMAKE_CURRENT_SOURCE_DIR}/${kernel}/kernel.json.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${kernel}/kernel.json")
+
+  configure_file (
+    "${CMAKE_CURRENT_SOURCE_DIR}/${kernel}/logo-32x32.png"
+    "${CMAKE_CURRENT_BINARY_DIR}/${kernel}/"
+    COPYONLY)
+  configure_file (
+    "${CMAKE_CURRENT_SOURCE_DIR}/${kernel}/logo-64x64.png"
+    "${CMAKE_CURRENT_BINARY_DIR}/${kernel}/"
+    COPYONLY)
+  configure_file (
+    "${CMAKE_CURRENT_SOURCE_DIR}/${kernel}/logo-svg.svg"
+    "${CMAKE_CURRENT_BINARY_DIR}/${kernel}/"
+    COPYONLY)
+endfunction()
+
+message("Configure kernels: ...")
+configure_kernel("share/jupyter/kernels/xcpp")
+configure_kernel("share/jupyter/kernels/xcpp11")
+configure_kernel("share/jupyter/kernels/xcpp14")
+configure_kernel("share/jupyter/kernels/xcpp17")
 
 # Source files
 # ============

share/jupyter/kernels/xcpp/kernel.json.in

@@ -1,5 +1,5 @@
 {
-  "display_name": "cpp 14 (xcpp)",
+  "display_name": "cpp 17 (xcpp)",
   "env": {
       "PATH":"@XEUS_CPP_PATH@",
       "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
@@ -10,7 +10,7 @@
       "{connection_file}",
       "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
       "-I", "@CMAKE_INSTALL_PREFIX@/include",
-      "-std=c++14"@XEUS_CPP_OMP@
+      "-std=c++17"@XEUS_CPP_OMP@
   ],
   "language": "cpp",
   "metadata": {"debugger": false

share/jupyter/kernels/xcpp11/kernel.json.in

@@ -0,0 +1,16 @@
+{
+  "display_name": "C++11 (xcpp)",
+  "env": {
+      "PATH":"@XEUS_CPP_PATH@",
+      "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
+  },
+  "argv": [
+      "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
+      "-f",
+      "{connection_file}",
+      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-std=c++11"@XEUS_CPP_OMP@
+  ],
+  "language": "cpp",
+  "metadata": {"debugger": false}
+}

share/jupyter/kernels/xcpp11/logo-32x32.png

@@ -0,0 +1,20 @@
+{
+  "display_name": "C++14 (xcpp)",
+  "env": {
+      "PATH":"@XEUS_CPP_PATH@",
+      "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
+  },
+  "argv": [
+      "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
+      "-f",
+      "{connection_file}",
+      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-I", "@CMAKE_INSTALL_PREFIX@/include",
+      "-std=c++14",
+      "-fno-exceptions",
+      "-O2",
+      "-v"@XEUS_CPP_OMP@
+  ],
+  "language": "cpp",
+  "metadata": {"debugger": false}
+}

share/jupyter/kernels/xcpp11/logo-64x64.png

@@ -0,0 +1,18 @@
+{
+  "display_name": "C++17 (xcpp+OpenMP)",
+  "env": {
+      "PATH":"@XEUS_CPP_PATH@",
+      "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
+  },
+  "argv": [
+      "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
+      "-f",
+      "{connection_file}",
+      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-I", "@CMAKE_INSTALL_PREFIX@/include",
+      "-std=c++17"@XEUS_CPP_OMP@
+  ],
+  "language": "cpp",
+  "metadata": {"debugger": false
+  }
+}

share/jupyter/kernels/xcpp11/logo-svg.svg

@@ -0,0 +1,18 @@
+{
+  "display_name": "C++17 (xcpp)",
+  "env": {
+      "PATH":"@XEUS_CPP_PATH@",
+      "LD_LIBRARY_PATH":"@XEUS_CPP_LD_LIBRARY_PATH@"
+  },
+  "argv": [
+      "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
+      "-f",
+      "{connection_file}",
+      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-I", "@CMAKE_INSTALL_PREFIX@/include",
+      "-std=c++17"@XEUS_CPP_OMP@
+  ],
+  "language": "cpp",
+  "metadata": {"debugger": false
+  }
+}