Skip to content

Commit be73527

Browse files
committed
Make use of XEUS_CPP_RESOURCE_DIR when doing Emscripten build of xeus-cpp
1 parent fa1c97d commit be73527

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

.github/workflows/deploy-pages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ jobs:
221221
-DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} \
222222
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
223223
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
224+
-DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}/lib/clang/${{ matrix.clang-runtime }} \
224225
-DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \
225226
..
226227
emmake make -j ${{ env.ncpus }} install

.github/workflows/emscripten.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ jobs:
817817
-DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} \
818818
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
819819
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
820+
-DXEUS_CPP_RESOURCE_DIR=${{ env.LLVM_BUILD_DIR }}/lib/clang/${{ matrix.clang-runtime }} \
820821
-DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \
821822
..
822823
emmake make -j ${{ env.ncpus }} install

Emscripten-build-instructions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ emmake make -j $(nproc --all) install
291291
## Xeus-cpp-lite Wasm Build Instructions
292292

293293
A project which makes use of the wasm build of CppInterOp is xeus-cpp. xeus-cpp is a C++ Jupyter kernel. Assuming you are in
294-
the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing
294+
the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing (replace $LLVM_VERSION with the version
295+
of llvm you are building against)
295296

296297
```bash
297298
cd ../..
@@ -305,6 +306,7 @@ emcmake cmake \
305306
-DCMAKE_INSTALL_PREFIX=$PREFIX \
306307
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
307308
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
309+
-DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \
308310
-DSYSROOT_PATH=$SYSROOT_PATH \
309311
..
310312
emmake make -j $(nproc --all) install

docs/Emscripten-build-instructions.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ Assuming it passes all test you can install by executing the following.
315315
A project which makes use of the wasm build of CppInterOp is xeus-cpp.
316316
xeus-cpp is a C++ Jupyter kernel. Assuming you are in the CppInterOp
317317
build folder, you can build the wasm version of xeus-cpp by executing
318+
(replace $LLVM_VERSION with the version of llvm you are building against)
318319

319320
.. code:: bash
320321
@@ -329,6 +330,7 @@ build folder, you can build the wasm version of xeus-cpp by executing
329330
-DCMAKE_INSTALL_PREFIX=$PREFIX \
330331
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
331332
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
333+
-DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \
332334
-DSYSROOT_PATH=$SYSROOT_PATH \
333335
..
334336
emmake make -j $(nproc --all) install

0 commit comments

Comments
 (0)