diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index 6673f6fe9..a96c1e39d 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -116,7 +116,6 @@ jobs: # Build CppInterOp next to cling and llvm-project. mkdir build cd build - export CPPINTEROP_BUILD_DIR=$PWD if [[ "${cling_on}" == "ON" ]]; then emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ @@ -153,7 +152,6 @@ jobs: echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV - echo "CPPINTEROP_BUILD_DIR=$CPPINTEROP_BUILD_DIR" >> $GITHUB_ENV echo "CPPINTEROP_DIR=$CPPINTEROP_DIR" >> $GITHUB_ENV echo "LLVM_BUILD_DIR=$LLVM_BUILD_DIR" >> $GITHUB_ENV echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV @@ -177,7 +175,6 @@ jobs: -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \ -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \ .. emmake make -j ${{ env.ncpus }} install diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 7444d37df..711376599 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -571,7 +571,6 @@ jobs: # Build CppInterOp next to cling and llvm-project. mkdir build cd build - export CPPINTEROP_BUILD_DIR=$PWD if [[ "${cling_on}" == "ON" ]]; then emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ -DCPPINTEROP_USE_CLING=ON \ @@ -609,7 +608,6 @@ jobs: echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV - echo "CPPINTEROP_BUILD_DIR=$CPPINTEROP_BUILD_DIR" >> $GITHUB_ENV echo "CPPINTEROP_DIR=$CPPINTEROP_DIR" >> $GITHUB_ENV echo "LLVM_BUILD_DIR=$LLVM_BUILD_DIR" >> $GITHUB_ENV echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV @@ -633,7 +631,6 @@ jobs: -DCMAKE_INSTALL_PREFIX=${{ env.PREFIX }} \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \ -DSYSROOT_PATH=${{ env.SYSROOT_PATH }} \ .. emmake make -j ${{ env.ncpus }} install diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index 943062f07..87c60b1e2 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -121,12 +121,6 @@ Assuming it passes all test you can install by executing the following emmake make -j $(nproc --all) install ``` -Once this finishes building we need to take note of where we built CppInterOp. This can be done by executing the following - -```bash -export CPPINTEROP_BUILD_DIR=$PWD -``` - ## Xeus-cpp-lite Wasm Build Instructions 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 @@ -144,7 +138,6 @@ emcmake cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DCppInterOp_DIR="$CPPINTEROP_BUILD_DIR/lib/cmake/CppInterOp" \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j $(nproc --all) install diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index f849f64bf..3b8eda565 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -139,13 +139,6 @@ Assuming it passes all test you can install by executing the following. emmake make -j $(nproc --all) install -Once this finishes building we need to take note of where we built -CppInterOp. This can be done by executing the following - -.. code:: bash - - export CPPINTEROP_BUILD_DIR=$PWD - ## Xeus-cpp-lite Wasm Build Instructions A project which makes use of the wasm build of CppInterOp is xeus-cpp. @@ -165,7 +158,6 @@ build folder, you can build the wasm version of xeus-cpp by executing -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DCppInterOp_DIR="$CPPINTEROP_BUILD_DIR/lib/cmake/CppInterOp" \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j $(nproc --all) install