Skip to content

Commit 405b97e

Browse files
committed
Fix build issues
1 parent 37702dd commit 405b97e

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,11 @@ macro(xeus_cpp_create_target target_name linkage output_name)
343343
if (MSVC)
344344
target_compile_options(${target_name} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
345345
endif()
346-
# elseif (NOT EMSCRIPTEN)
347-
else ()
346+
elseif (NOT EMSCRIPTEN)
348347
# Curl initialised specifically for xassist
349348
target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse curl)
350-
# else ()
351-
# target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
349+
else ()
350+
target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
352351
endif()
353352

354353
if (WIN32 OR CYGWIN)

test/test_xcpp_kernel.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,10 @@ class XCppTests(jupyter_kernel_test.KernelTests):
7777
language_name = 'C++'
7878

7979
# Code that should write the exact string `hello, world` to STDOUT
80-
code_hello_world = '#include <iostream>\nstd::cout << "hello, world";'
80+
code_hello_world = '#include <iostream>\nstd::cout << "hello, world" << std::endl;'
8181

8282
# Code that should cause (any) text to be written to STDERR
83-
code_stderr = """
84-
#include <iostream>
85-
std::cerr << "oops" << std::endl;
86-
"""
83+
code_stderr = '#include <iostream>\nstd::cerr << "oops" << std::endl;'
8784

8885
# Pager: code that should display something (anything) in the pager
8986
code_page_something = "?std::vector"

0 commit comments

Comments
 (0)