Remove using is_wasm and reduce links of configure_kernel further

Author: mcbarton

CMakeLists.txt

@@ -120,31 +120,25 @@ if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
     set(XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/")
 endif ()
 
-function(configure_kernel kernel is_wasm)
-  if(NOT is_wasm)
+function(configure_kernel kernel)
+  if (WIN32)
+    string(REPLACE "\\" "/" kernel "${kernel}")
+    string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
+    string(REPLACE "\\" "/" XEUS_CPP_LD_LIBRARY_PATH "${XEUS_CPP_LD_LIBRARY_PATH}")
+    string(REPLACE "\\" "/" XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}")
+    string(REPLACE "\\" "/" XEUS_CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
+  endif()
+  if(NOT EMSCRIPTEN)
+    set(prefix "wasm")
+  else()
     set(XEUS_CPP_PATH "$ENV{PATH}")
     set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
     set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
-
-    if (WIN32)
-      string(REPLACE "\\" "/" kernel "${kernel}")
-      string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
-      string(REPLACE "\\" "/" XEUS_CPP_LD_LIBRARY_PATH "${XEUS_CPP_LD_LIBRARY_PATH}")
-      string(REPLACE "\\" "/" XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}")
-      string(REPLACE "\\" "/" XEUS_CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
-    endif()
-
-    configure_file(
-      "${CMAKE_CURRENT_SOURCE_DIR}${kernel}kernel.json.in"
-      "${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json"
-    )
-  else()
-    configure_file(
-      "${CMAKE_CURRENT_SOURCE_DIR}${kernel}wasm_kernel.json.in"
-      "${CMAKE_CURRENT_BINARY_DIR}${kernel}kernel.json"
-    )
   endif()
-
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}${prefix}${kernel}${prefix}_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}"
@@ -163,15 +157,9 @@ function(configure_kernel kernel is_wasm)
 endfunction()
 
 message("Configure kernels: ...")
-if(EMSCRIPTEN)
-    configure_kernel("/share/jupyter/kernels/xcpp17/" TRUE)
-    configure_kernel("/share/jupyter/kernels/xcpp20/" TRUE)
-    configure_kernel("/share/jupyter/kernels/xcpp23/" TRUE)
-else()
-    configure_kernel("/share/jupyter/kernels/xcpp17/" FALSE)
-    configure_kernel("/share/jupyter/kernels/xcpp20/" FALSE)
-    configure_kernel("/share/jupyter/kernels/xcpp23/" FALSE)
-endif()
+configure_kernel("/share/jupyter/kernels/xcpp17/")
+configure_kernel("/share/jupyter/kernels/xcpp20/")
+configure_kernel("/share/jupyter/kernels/xcpp23/")
 
 # Source files
 # ============