Skip to content

Commit

Permalink
Fix some errors in build-linux as we slowly cmake transition
Browse files Browse the repository at this point in the history
  • Loading branch information
baconpaul committed Apr 15, 2020
1 parent c69bd6d commit 37e47be
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,34 @@ run_cmake()
{
mkdir -p build
cmake . -Bbuild
touch cmake-stamp
}

run_cmake_if()
{
if [[ CMakeLists.txt -nt cmake-stamp ]]; then
if [[ ! -f build/CMakeCache.txt ]]; then
run_cmake
fi
if [[ ! -d build ]]; then
if [[ CMakeLists.txt -nt build/CMakeCache.txt ]]; then
run_cmake
fi
}

run_clean()
{
if [[ -d build ]]; then
cd build
pushd build
make clean
popd
fi
}

run_build()
{
local flavor=$1
cd build
pushd build
make -j 2 $flavor

popd

build_suc=$?
if [[ $build_suc = 0 ]]; then
echo ${GREEN}Build of ${flavor} succeeded${NC}
Expand Down Expand Up @@ -155,7 +156,7 @@ run_clean_all()
run_clean_builds

echo "Cleaning additional assets"
rm -rf Makefile surge-vst2.make surge-vst3.make surge-lv2.make surge-headless.make build_logs target obj cmake-stamp build
rm -rf target products build
}

run_uninstall()
Expand Down

0 comments on commit 37e47be

Please sign in to comment.