File tree Expand file tree Collapse file tree 5 files changed +83
-80
lines changed Expand file tree Collapse file tree 5 files changed +83
-80
lines changed Original file line number Diff line number Diff line change 74
74
run : |
75
75
micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
76
76
77
- - name : activate environment
78
- if : ${{ runner.os != 'windows' }}
79
- shell : bash -l {0}
80
- run : |
81
- micromamba activate xeus-cpp
82
-
83
77
- name : install cxx compiler
84
78
if : ${{ runner.os != 'windows' }}
85
79
shell : bash -l {0}
@@ -124,17 +118,13 @@ jobs:
124
118
cd build
125
119
make install -j ${{ env.ncpus }}
126
120
127
- # - name: Setup tmate session
128
- # if: ${{ runner.os != 'windows' }}
129
- # uses: mxschmitt/action-tmate@v3
130
-
131
121
- name : Test xeus-cpp C++ Unix Systems
132
122
if : ${{ runner.os != 'windows' }}
133
123
shell : bash -l {0}
134
124
run : |
135
125
cd build/test
136
126
./test_xeus_cpp
137
- timeout-minutes : 30
127
+ timeout-minutes : 4
138
128
139
129
- name : Test xeus-cpp C++ Windows Systems
140
130
if : ${{ runner.os == 'windows' }}
Original file line number Diff line number Diff line change @@ -203,10 +203,15 @@ set(XEUS_CPP_SRC
203
203
src/xoptions.cpp
204
204
src/xparser.cpp
205
205
src/xutils.cpp
206
- src/xmagics/xassist.hpp
207
- src/xmagics/xassist.cpp
208
206
)
209
207
208
+ if (NOT EMSCRIPTEN)
209
+ list (APPEND XEUS_CPP_SRC
210
+ src/xmagics/xassist.hpp
211
+ src/xmagics/xassist.cpp
212
+ )
213
+ endif ()
214
+
210
215
if (EMSCRIPTEN)
211
216
list (APPEND XEUS_CPP_SRC src/xinterpreter_wasm.cpp)
212
217
endif ()
@@ -312,7 +317,8 @@ macro(xeus_cpp_create_target target_name linkage output_name)
312
317
set (XEUS_CPP_XEUS_TARGET xeus-static )
313
318
endif ()
314
319
315
- if (WIN32 )
320
+ #This is a workaround for the issue with the libcurl target on Windows specifically for xassist
321
+ if (WIN32 )
316
322
# Set the MSVC runtime library
317
323
set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" )
318
324
@@ -337,8 +343,11 @@ macro(xeus_cpp_create_target target_name linkage output_name)
337
343
if (MSVC )
338
344
target_compile_options (${target_name} PRIVATE "/MD$<$<CONFIG:Debug>:d>" )
339
345
endif ()
340
- else ()
346
+ elseif (NOT EMSCRIPTEN)
347
+ # Curl initialised specifically for xassist
341
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)
342
351
endif ()
343
352
344
353
if (WIN32 OR CYGWIN )
Original file line number Diff line number Diff line change @@ -4,5 +4,4 @@ channels:
4
4
dependencies :
5
5
- cmake
6
6
- emsdk >=3.1.11
7
- - empack >=2.0.1
8
- - curl
7
+ - empack >=2.0.1
Original file line number Diff line number Diff line change 28
28
#include " xinput.hpp"
29
29
#include " xinspect.hpp"
30
30
#include " xmagics/os.hpp"
31
+ #ifndef EMSCRIPTEN
31
32
#include " xmagics/xassist.hpp"
33
+ #endif
32
34
#include " xparser.hpp"
33
35
#include " xsystem.hpp"
34
36
@@ -405,6 +407,8 @@ __get_cxx_version ()
405
407
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("file", writefile());
406
408
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("timeit", timeit(&m_interpreter));
407
409
// preamble_manager["magics"].get_cast<xmagics_manager>().register_magic("python", pythonexec());
410
+ #ifndef EMSCRIPTEN
408
411
preamble_manager[" magics" ].get_cast <xmagics_manager>().register_magic (" xassist" , xassist ());
412
+ #endif
409
413
}
410
414
}
You can’t perform that action at this time.
0 commit comments