Fix build issues

compiler-research · Sep 12, 2024 · 405b97e · 405b97e
1 parent 37702dd
commit 405b97e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -343,12 +343,11 @@ macro(xeus_cpp_create_target target_name linkage output_name)
         if (MSVC)
             target_compile_options(${target_name} PRIVATE "/MD$<$<CONFIG:Debug>:d>")
         endif()
-    # elseif (NOT EMSCRIPTEN)
-    else ()
+    elseif (NOT EMSCRIPTEN)
         # Curl initialised specifically for xassist
         target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse curl)
-    # else ()
-    #     target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
+    else ()
+        target_link_libraries(${target_name} PUBLIC ${XEUS_CPP_XEUS_TARGET} clangCppInterOp pugixml argparse::argparse)
     endif()
 
     if (WIN32 OR CYGWIN)

diff --git a/test/test_xcpp_kernel.py b/test/test_xcpp_kernel.py
@@ -77,13 +77,10 @@ class XCppTests(jupyter_kernel_test.KernelTests):
         language_name = 'C++'
 
         # Code that should write the exact string `hello, world` to STDOUT
-        code_hello_world = '#include <iostream>\nstd::cout << "hello, world";'
+        code_hello_world = '#include <iostream>\nstd::cout << "hello, world" << std::endl;'
 
         # Code that should cause (any) text to be written to STDERR
-        code_stderr = """
-        #include <iostream>
-        std::cerr << "oops" << std::endl;
-        """
+        code_stderr = '#include <iostream>\nstd::cerr << "oops" << std::endl;'
 
         # Pager: code that should display something (anything) in the pager
         code_page_something = "?std::vector"