Make XEUS_CPP_RESOURCE_DIR a user configurable option (#312)

* Make XEUS_CPP_RESOURCE_DIR a user configurable option

---------

Co-authored-by: anutosh491 <[email protected]>

Author: mcbarton

CMakeLists.txt

@@ -111,14 +111,18 @@ find_package(pugixml REQUIRED)
 # Configuration
 # =============
 
+if(NOT DEFINED XEUS_CPP_RESOURCE_DIR)
+    set(XEUS_CPP_RESOURCE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}")
+    message(STATUS "Using clang resource dir headers from ${XEUS_CPP_RESOURCE_DIR}")
+endif()
+
 if (NOT DEFINED XEUS_CPP_KERNELSPEC_PATH)
     set(XEUS_CPP_KERNELSPEC_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/")
 endif ()
 
 function(configure_native_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_LLVM_VERSION_MAJOR})
   set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
 
   if (WIN32)
@@ -169,7 +173,6 @@ endfunction()
 
 message("Configure kernels: ...")
 if(EMSCRIPTEN)
-    set(XEUS_CPP_RESOURCE_DIR "/lib/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}")
     configure_wasm_kernel("/share/jupyter/kernels/xcpp17/")
     configure_wasm_kernel("/share/jupyter/kernels/xcpp20/")
     configure_wasm_kernel("/share/jupyter/kernels/xcpp23/")
@@ -438,7 +441,7 @@ if(EMSCRIPTEN)
     target_link_options(xcpp
         PUBLIC "SHELL: -s USE_SDL=2"
         PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
-        PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
+        PUBLIC "SHELL: --preload-file ${XEUS_CPP_RESOURCE_DIR}@/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
         PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
@@ -535,4 +538,4 @@ if(EMSCRIPTEN)
             "$<TARGET_FILE_DIR:xcpp>/xcpp.wasm"
             "$<TARGET_FILE_DIR:xcpp>/xcpp.data"
             DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif ()
+endif ()

share/jupyter/kernels/xcpp17/wasm_kernel.json.in

@@ -2,7 +2,7 @@
   "display_name": "C++17",
   "argv": [
       "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
-      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
       "-std=c++17"
   ],
   "language": "cpp",

share/jupyter/kernels/xcpp20/wasm_kernel.json.in

@@ -2,7 +2,7 @@
   "display_name": "C++20",
   "argv": [
       "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
-      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
       "-std=c++20"
   ],
   "language": "cpp",

share/jupyter/kernels/xcpp23/wasm_kernel.json.in

@@ -2,7 +2,7 @@
   "display_name": "C++23",
   "argv": [
       "@XEUS_CPP_KERNELSPEC_PATH@xcpp",
-      "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
+      "-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
       "-std=c++23"
   ],
   "language": "cpp",