From 6efe09348de50e514c6861663fbbb209f7cbd6f8 Mon Sep 17 00:00:00 2001 From: michaelrossherron Date: Mon, 13 May 2024 15:52:18 -0600 Subject: [PATCH] Added plugin builds to FEBio push workflows --- ci/Linux/build.sh | 2 ++ ci/Linux/cmake.sh | 3 +++ ci/Windows/build.bat | 9 +++++++-- ci/macOS/build.sh | 2 ++ ci/macOS/cmake.sh | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/Linux/build.sh b/ci/Linux/build.sh index 315c153..fa432b7 100755 --- a/ci/Linux/build.sh +++ b/ci/Linux/build.sh @@ -4,10 +4,12 @@ set -e . $(dirname $0)/cmake.sh main() { + pushd $(dirname $0)/../.. run_cmake pushd cmbuild make -j $(nproc) popd + popd } main diff --git a/ci/Linux/cmake.sh b/ci/Linux/cmake.sh index e80c178..5dbc86a 100755 --- a/ci/Linux/cmake.sh +++ b/ci/Linux/cmake.sh @@ -1,5 +1,8 @@ LIB_DIR="/usr/lib/x86_64-linux-gnu" + FEBIO_SDK="${FEBIO_SDK:-febio4-sdk}" +FEBIO_SDK="$(realpath $FEBIO_SDK)" + run_cmake() { cmake -L . -B cmbuild \ -DFEBio_SDK=$FEBIO_SDK diff --git a/ci/Windows/build.bat b/ci/Windows/build.bat index 2d03691..03a9796 100644 --- a/ci/Windows/build.bat +++ b/ci/Windows/build.bat @@ -2,10 +2,15 @@ call "%ONEAPI_ROOT%\setvars.bat" set /a "PROC=%NUMBER_OF_PROCESSORS%" cmake -version +SET STARTDIR=%cd% +SET SCRIPTDIR=%~dp0 + +cd %SCRIPTDIR%\..\..\ + cmake -L . -B cmbuild ^ - -DFEBio_SDK=febio4-sdk + -DFEBio_SDK=%STARTDIR%\febio4-sdk ) cd cmbuild msbuild /P:Configuration=Release /P:WarningLevel=0 /m:%PROC% ALL_BUILD.vcxproj -cd .. +cd %STARTDIR% exit 0 diff --git a/ci/macOS/build.sh b/ci/macOS/build.sh index 1c0e26e..e40d0ab 100755 --- a/ci/macOS/build.sh +++ b/ci/macOS/build.sh @@ -4,10 +4,12 @@ set -e . $(dirname $0)/cmake.sh main() { + pushd $(dirname $0)/../.. run_cmake pushd cmbuild make -j $(sysctl -n hw.ncpu) popd + popd } main diff --git a/ci/macOS/cmake.sh b/ci/macOS/cmake.sh index b7f3172..3475430 100644 --- a/ci/macOS/cmake.sh +++ b/ci/macOS/cmake.sh @@ -1,4 +1,5 @@ FEBIO_SDK="${FEBIO_SDK:-febio4-sdk}" +FEBIO_SDK="$(realpath $FEBIO_SDK)" run_cmake() { cmake -L . -B cmbuild \ -DFEBio_SDK=$FEBIO_SDK \