Skip to content

Commit

Permalink
Update build to follow CMake deprecations.
Browse files Browse the repository at this point in the history
  • Loading branch information
whitequark committed Jan 11, 2025
1 parent a30180f commit fdb529e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [ ${THREADS:-0} -ne 0 ]; then
fi

cat >Toolchain-WASI.cmake <<END
cmake_minimum_required(VERSION 3.4.0)
cmake_minimum_required(VERSION 3.4...3.31)
set(WASI TRUE)
Expand Down Expand Up @@ -70,7 +70,7 @@ project : default-build <toolset>clang ;
libraries = --with-program_options --with-iostreams --with-filesystem --with-system ${BOOST_ADD_LIBRARIES} ;
END
(cd ${BOOST} && PATH=${WASI_SDK_PATH}/bin:$PATH ./tools/build/src/engine/b2 threading=${BOOST_THREADING} link=static)
(cd ${BOOST} && PATH=${WASI_SDK_PATH}/bin:$PATH ./tools/build/src/engine/b2 threading=${BOOST_THREADING} link=static stage)

cmake -B eigen-build -S ${EIGEN} -DCMAKE_INSTALL_PREFIX=$(pwd)/eigen-prefix
make -C eigen-build install
Expand All @@ -86,6 +86,7 @@ cp icestorm-src/icefuzz/timings_*.txt $(pwd)/icestorm-prefix/share/icebox/

cmake -B prjtrellis-build -S prjtrellis-src/libtrellis \
-DCMAKE_TOOLCHAIN_FILE=../Toolchain-WASI.cmake \
-DCMAKE_PREFIX_PATH=$(pwd)/${BOOST}/stage/ \
-DBOOST_ROOT=$(pwd)/${BOOST} \
-DSTATIC_BUILD=ON \
-DBUILD_SHARED=OFF \
Expand All @@ -94,7 +95,6 @@ cmake --build prjtrellis-build

cmake -B libtrellis-build -S prjtrellis-src/libtrellis \
-DCMAKE_INSTALL_PREFIX=$(pwd)/libtrellis-prefix \
-DPYTHON_EXECUTABLE=${PYTHON} \
-DBUILD_ECPBRAM=OFF \
-DBUILD_ECPPACK=OFF \
-DBUILD_ECPUNPACK=OFF \
Expand Down Expand Up @@ -122,8 +122,8 @@ ${PYTHON} -m venv apycula-prefix
mkdir -p nextpnr-build
cmake -B nextpnr-build -S nextpnr-src \
-DCMAKE_TOOLCHAIN_FILE=../Toolchain-WASI.cmake \
-DCMAKE_PREFIX_PATH=$(pwd)/${BOOST}/stage/ \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DPYTHON_EXECUTABLE=${PYTHON} \
-DSTATIC_BUILD=ON \
-DBOOST_ROOT=$(pwd)/${BOOST} \
-DEigen3_DIR=$(pwd)/eigen-prefix/share/eigen3/cmake \
Expand Down
2 changes: 1 addition & 1 deletion prjtrellis-src

0 comments on commit fdb529e

Please sign in to comment.