@@ -54,8 +54,8 @@ option(XEUS_CPP_BUILD_STATIC "Build xeus-cpp static library" ON)
54
54
option (XEUS_CPP_BUILD_SHARED "Split xcpp build into executable and library" ON )
55
55
option (XEUS_CPP_BUILD_EXECUTABLE "Build the xcpp executable" ON )
56
56
57
- option (XEUS_CPP_USE_SHARED_XEUS "Link xcpp with the xeus shared library (instead of the static library)" ON )
58
- option (XEUS_CPP_USE_SHARED_XEUS_CPP "Link xcpp with the xeus shared library (instead of the static library)" ON )
57
+ option (XEUS_CPP_USE_SHARED_XEUS "Link xcpp with the xeus shared library (instead of the static library)" ON )
58
+ option (XEUS_CPP_USE_SHARED_XEUS_CPP "Link xcpp with the xeus-cpp shared library (instead of the static library)" ON )
59
59
option (XEUS_CPP_EMSCRIPTEN_WASM_BUILD "Build for wasm with emscripten" OFF )
60
60
61
61
# Test options
@@ -77,10 +77,11 @@ endif()
77
77
if (EMSCRIPTEN)
78
78
add_compile_definitions (XEUS_CPP_EMSCRIPTEN_WASM_BUILD)
79
79
message ("Build with emscripten" )
80
+ set_property (GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE )
80
81
set (XEUS_CPP_BUILD_STATIC ON )
81
82
set (XEUS_CPP_BUILD_SHARED OFF )
82
83
set (XEUS_CPP_BUILD_EXECUTABLE OFF )
83
- set (XEUS_CPP_USE_SHARED_XEUS OFF )
84
+ set (XEUS_CPP_USE_SHARED_XEUS ON )
84
85
set (XEUS_CPP_USE_SHARED_XEUS_CPP OFF )
85
86
# ENV (https://github.com/emscripten-core/emscripten/commit/6d9681ad04f60b41ef6345ab06c29bbc9eeb84e0)
86
87
set (EMSCRIPTEN_FEATURES "${EMSCRIPTEN_FEATURES} -s \" EXPORTED_RUNTIME_METHODS=[ENV']\" " )
@@ -546,4 +547,4 @@ if(EMSCRIPTEN)
546
547
"$<TARGET_FILE_DIR:xcpp>/xcpp.wasm"
547
548
"$<TARGET_FILE_DIR:xcpp>/xcpp.data"
548
549
DESTINATION ${CMAKE_INSTALL_BINDIR} )
549
- endif ()
550
+ endif ()
0 commit comments