Skip to content

Commit 80fc5ed

Browse files
committed
Revert "Changed in CMakeLists.txt to generate kernel json"
This reverts commit 3bd5f42.
1 parent 3bd5f42 commit 80fc5ed

File tree

3 files changed

+15
-31
lines changed

3 files changed

+15
-31
lines changed

examples/CMakeLists.txt

+1-27
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,6 @@ project(xeus-qt VERSION 0.0.1)
55
set(CMAKE_INCLUDE_CURRENT_DIR ON)
66
set(CMAKE_AUTOMOC ON)
77

8-
if (NOT DEFINED XEUS_QT_EXECUTABLE)
9-
set(XEUS_QT_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}")
10-
endif ()
11-
12-
configure_file(
13-
${CMAKE_CURRENT_SOURCE_DIR}/../share/jupyter/kernels/xq/kernel.json.in
14-
${CMAKE_CURRENT_BINARY_DIR}/share/jupyter/kernels/xq/kernel.json
15-
)
16-
17-
configure_file (
18-
"${CMAKE_CURRENT_SOURCE_DIR}/../share/jupyter/kernels/xq/logo-32x32.png"
19-
"${CMAKE_CURRENT_BINARY_DIR}/share/jupyter/kernels/xq/"
20-
COPYONLY
21-
)
22-
23-
configure_file (
24-
"${CMAKE_CURRENT_SOURCE_DIR}/../share/jupyter/kernels/xq/logo-64x64.png"
25-
"${CMAKE_CURRENT_BINARY_DIR}/share/jupyter/kernels/xq/"
26-
COPYONLY
27-
)
28-
298
#if(APPLE)
309
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=libc++ -mmacosx-version-min=10.8")
3110
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -headerpad_max_install_names")
@@ -85,11 +64,6 @@ target_link_libraries(
8564
PUBLIC xq
8665
)
8766

88-
install(
89-
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/jupyter/kernels/xq/
90-
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jupyter/kernels/xq
91-
)
92-
9367
#MacOS bug https://github.com/lloyd/yajl/issues/201
9468
install(TARGETS ${PROJECT_NAME}
95-
BUNDLE DESTINATION bin)
69+
BUNDLE DESTINATION bin)

share/jupyter/kernels/xq/kernel.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"display_name": "Qt 5.12 (xq)",
3+
"argv": [
4+
"xeus-qt",
5+
"-f",
6+
"{connection_file}"
7+
],
8+
"language": "c++",
9+
"metadata": { "debugger": false }
10+
}
+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"display_name": "xeus-qt @XEUS_QT_VERSION_MAJOR@.@XEUS_QT_VERSION_MINOR@ (xq)",
33
"argv": [
4-
"@XEUS_QT_EXECUTABLE@",
4+
"@XQ_KERNELSPEC_PATH@xq",
55
"-f",
66
"{connection_file}"
77
],
8-
"language": "xq",
9-
"metadata": { "debugger": false }
10-
}
8+
"language": "xq,
9+
"metadata": { "debugger": true }
10+
}

0 commit comments

Comments
 (0)