File tree 2 files changed +6
-2
lines changed 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -318,7 +318,7 @@ macro(xeus_cpp_create_target target_name linkage output_name)
318
318
endif ()
319
319
320
320
#This is a workaround for the issue with the libcurl target on Windows specifically for xassist
321
- if (WIN32 )
321
+ if (WIN32 )
322
322
# Set the MSVC runtime library
323
323
set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" )
324
324
@@ -343,9 +343,11 @@ macro(xeus_cpp_create_target target_name linkage output_name)
343
343
if (MSVC )
344
344
target_compile_options (${target_name} PRIVATE "/MD$<$<CONFIG:Debug>:d>" )
345
345
endif ()
346
- else ( )
346
+ elseif ( UNIX )
347
347
# Curl initialised specifically for xassist
348
348
target_link_libraries (${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse curl)
349
+ else ()
350
+ target_link_libraries (${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
349
351
endif ()
350
352
351
353
if (WIN32 OR CYGWIN )
Original file line number Diff line number Diff line change @@ -407,6 +407,8 @@ __get_cxx_version ()
407
407
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("file", writefile());
408
408
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("timeit", timeit(&m_interpreter));
409
409
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("python", pythonexec());
410
+ #ifndef EMSCRIPTEN
410
411
preamble_manager[" magics" ].get_cast <xmagics_manager>().register_magic (" xassist" , xassist ());
412
+ #endif
411
413
}
412
414
}
You can’t perform that action at this time.
0 commit comments