diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index de37e2fb..96ef855e 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -57,16 +57,13 @@ jobs: export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host echo "PREFIX=$PREFIX" >> $GITHUB_ENV - export CMAKE_PREFIX_PATH=$PREFIX - export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j ${{ env.ncpus }} install diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f92c59b7..c6f12b60 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -255,16 +255,13 @@ jobs: export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host echo "PREFIX=$PREFIX" >> $GITHUB_ENV - export CMAKE_PREFIX_PATH=$PREFIX - export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j ${{ env.ncpus }} install diff --git a/README.md b/README.md index 330c7b22..bb143784 100644 --- a/README.md +++ b/README.md @@ -85,16 +85,13 @@ micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32 mkdir build pushd build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host -export CMAKE_PREFIX_PATH=$PREFIX -export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make install diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index 9b6ea9a5..e24cb9b4 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -69,15 +69,12 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin mkdir build pushd build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host - export CMAKE_PREFIX_PATH=$PREFIX - export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ - -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ + -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make install