Skip to content

Commit aa6daa0

Browse files
authored
Fix
1 parent 2367e1c commit aa6daa0

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,14 @@ function(configure_kernel kernel)
130130
set(XEUS_CPP_PATH "$ENV{PATH}")
131131
set(XEUS_CPP_LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
132132
set(XEUS_CPP_RESOURCE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/clang/${CPPINTEROP_LLVM_VERSION_MAJOR})
133-
133+
set(XEUS_CPP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
134+
134135
if (WIN32)
135136
string(REPLACE "\\" "/" kernel "${kernel}")
136137
string(REPLACE "\\" "/" XEUS_CPP_PATH "${XEUS_CPP_PATH}")
137138
string(REPLACE "\\" "/" XEUS_CPP_LD_LIBRARY_PATH "${XEUS_CPP_LD_LIBRARY_PATH}")
138139
string(REPLACE "\\" "/" XEUS_CPP_RESOURCE_DIR "${XEUS_CPP_RESOURCE_DIR}")
140+
string(REPLACE "\\" "/" XEUS_CPP_INCLUDE_DIR "${XEUS_CPP_INCLUDE_DIR}")
139141
endif()
140142

141143
configure_file (

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"-f",
1010
"{connection_file}",
1111
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
1213
"-std=c++11"@XEUS_CPP_OMP@
1314
],
1415
"language": "cpp",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"-f",
1010
"{connection_file}",
1111
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12-
"-I", "@CMAKE_INSTALL_PREFIX@/include",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
1313
"-std=c++14",
1414
"-fno-exceptions",
1515
"-O2",

share/jupyter/kernels/xcpp17-omp/kernel.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"-f",
1010
"{connection_file}",
1111
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12-
"-I", "@CMAKE_INSTALL_PREFIX@/include",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
1313
"-std=c++17"@XEUS_CPP_OMP@
1414
],
1515
"language": "cpp",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"-f",
1010
"{connection_file}",
1111
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12-
"-I", "@CMAKE_INSTALL_PREFIX@/include",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
1313
"-std=c++17"@XEUS_CPP_OMP@
1414
],
1515
"language": "cpp",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"-f",
1010
"{connection_file}",
1111
"-resource-dir", "@XEUS_CPP_RESOURCE_DIR@",
12-
"-I", "@CMAKE_INSTALL_PREFIX@/include",
12+
"-I", "@XEUS_CPP_INCLUDE_DIR@",
1313
"-std=c++20"@XEUS_CPP_OMP@
1414
],
1515
"language": "cpp",

0 commit comments

Comments
 (0)