Skip to content

Commit 412c51c

Browse files
authored
Fix faulty CMAKE_FIND_ROOT_PATH_MODE_PACKAGE used for the wasm build (#204)
1 parent ac45e1f commit 412c51c

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

.github/workflows/deploy-github-page.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,13 @@ jobs:
5757
5858
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
5959
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
60-
export CMAKE_PREFIX_PATH=$PREFIX
61-
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
6260
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
6361
6462
emcmake cmake \
6563
-DCMAKE_BUILD_TYPE=Release \
66-
-DCMAKE_PREFIX_PATH=$PREFIX \
6764
-DCMAKE_INSTALL_PREFIX=$PREFIX \
6865
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
69-
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
66+
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
7067
-DSYSROOT_PATH=$SYSROOT_PATH \
7168
..
7269
emmake make -j ${{ env.ncpus }} install

.github/workflows/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,16 +255,13 @@ jobs:
255255
256256
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
257257
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
258-
export CMAKE_PREFIX_PATH=$PREFIX
259-
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
260258
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
261259
262260
emcmake cmake \
263261
-DCMAKE_BUILD_TYPE=Release \
264-
-DCMAKE_PREFIX_PATH=$PREFIX \
265262
-DCMAKE_INSTALL_PREFIX=$PREFIX \
266263
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
267-
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
264+
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
268265
-DSYSROOT_PATH=$SYSROOT_PATH \
269266
..
270267
emmake make -j ${{ env.ncpus }} install

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,13 @@ micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
8585
mkdir build
8686
pushd build
8787
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
88-
export CMAKE_PREFIX_PATH=$PREFIX
89-
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
9088
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
9189

9290
emcmake cmake \
9391
-DCMAKE_BUILD_TYPE=Release \
94-
-DCMAKE_PREFIX_PATH=$PREFIX \
9592
-DCMAKE_INSTALL_PREFIX=$PREFIX \
9693
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
97-
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
94+
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
9895
-DSYSROOT_PATH=$SYSROOT_PATH \
9996
..
10097
emmake make install

docs/source/InstallationAndUsage.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,12 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin
6969
mkdir build
7070
pushd build
7171
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
72-
export CMAKE_PREFIX_PATH=$PREFIX
73-
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
7472
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot
7573
emcmake cmake \
7674
-DCMAKE_BUILD_TYPE=Release \
77-
-DCMAKE_PREFIX_PATH=$PREFIX \
7875
-DCMAKE_INSTALL_PREFIX=$PREFIX \
7976
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
80-
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
77+
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
8178
-DSYSROOT_PATH=$SYSROOT_PATH \
8279
..
8380
emmake make install

0 commit comments

Comments
 (0)