diff --git a/CMakeLists.txt b/CMakeLists.txt index 50d05828..3c097c22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,15 +134,11 @@ endif () 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_LLVM_VERSION_MAJOR}) - 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 ( diff --git a/share/jupyter/kernels/xcpp11/kernel.json.in b/share/jupyter/kernels/xcpp11/kernel.json.in index 1f4f73a6..f919ecde 100644 --- a/share/jupyter/kernels/xcpp11/kernel.json.in +++ b/share/jupyter/kernels/xcpp11/kernel.json.in @@ -8,8 +8,6 @@ "@XEUS_CPP_KERNELSPEC_PATH@xcpp", "-f", "{connection_file}", - "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@", - "-I", "@XEUS_CPP_INCLUDE_DIR@", "-std=c++11"@XEUS_CPP_OMP@ ], "language": "cpp", diff --git a/share/jupyter/kernels/xcpp14/kernel.json.in b/share/jupyter/kernels/xcpp14/kernel.json.in index b6718dcf..a6add2c2 100644 --- a/share/jupyter/kernels/xcpp14/kernel.json.in +++ b/share/jupyter/kernels/xcpp14/kernel.json.in @@ -8,8 +8,6 @@ "@XEUS_CPP_KERNELSPEC_PATH@xcpp", "-f", "{connection_file}", - "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@", - "-I", "@XEUS_CPP_INCLUDE_DIR@", "-std=c++14", "-fno-exceptions", "-O2", diff --git a/share/jupyter/kernels/xcpp17-omp/kernel.json.in b/share/jupyter/kernels/xcpp17-omp/kernel.json.in index f74379f1..7feecb0a 100644 --- a/share/jupyter/kernels/xcpp17-omp/kernel.json.in +++ b/share/jupyter/kernels/xcpp17-omp/kernel.json.in @@ -8,8 +8,6 @@ "@XEUS_CPP_KERNELSPEC_PATH@xcpp", "-f", "{connection_file}", - "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@", - "-I", "@XEUS_CPP_INCLUDE_DIR@", "-std=c++17"@XEUS_CPP_OMP@ ], "language": "cpp", diff --git a/share/jupyter/kernels/xcpp17/kernel.json.in b/share/jupyter/kernels/xcpp17/kernel.json.in index ea76e2d9..8ac03feb 100644 --- a/share/jupyter/kernels/xcpp17/kernel.json.in +++ b/share/jupyter/kernels/xcpp17/kernel.json.in @@ -8,8 +8,6 @@ "@XEUS_CPP_KERNELSPEC_PATH@xcpp", "-f", "{connection_file}", - "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@", - "-I", "@XEUS_CPP_INCLUDE_DIR@", "-std=c++17"@XEUS_CPP_OMP@ ], "language": "cpp", diff --git a/share/jupyter/kernels/xcpp20/kernel.json.in b/share/jupyter/kernels/xcpp20/kernel.json.in index 3736754f..02aa3f07 100644 --- a/share/jupyter/kernels/xcpp20/kernel.json.in +++ b/share/jupyter/kernels/xcpp20/kernel.json.in @@ -8,8 +8,6 @@ "@XEUS_CPP_KERNELSPEC_PATH@xcpp", "-f", "{connection_file}", - "-resource-dir", "@XEUS_CPP_RESOURCE_DIR@", - "-I", "@XEUS_CPP_INCLUDE_DIR@", "-std=c++20"@XEUS_CPP_OMP@ ], "language": "cpp",