rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify B_CMAKE_FLAGS, and declare before further configuration 

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
This commit is contained in:
Dom Rodriguez 2021-11-05 16:25:27 +00:00
parent 4308e91214
commit cb754b6799
No known key found for this signature in database
GPG Key ID: 72DCF1231E54BD43
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clean_build.sh
View File

@ -19,7 +19,8 @@ else
fi fi
fi fi
B_BUILD_TYPE=${B_BUILD_TYPE:-Debug} B_BUILD_TYPE="${B_BUILD_TYPE:-Debug}"
B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=${B_BUILD_TYPE} ${B_CMAKE_FLAGS:-}"
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
# macOS needs a little help, so we source this environment script to fix paths. # macOS needs a little help, so we source this environment script to fix paths.
@ -30,7 +31,7 @@ if [ "$(uname)" = "Darwin" ]; then
. ./macOS_environment.sh . ./macOS_environment.sh
fi fi
B_CMAKE_FLAGS="-DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 ${B_CMAKE_FLAGS:-}" B_CMAKE_FLAGS="${B_CMAKE_FLAGS} -DCMAKE_OSX_SYSROOT=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9"
fi fi
# Source local build variables to the environment, if available. # Source local build variables to the environment, if available.
@ -42,8 +43,6 @@ fi
# Initialise Git submodules # Initialise Git submodules
git submodule update --init --recursive git submodule update --init --recursive
B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=${B_BUILD_TYPE} ${B_CMAKE_FLAGS:-}"
# Clear build directory, but do a conditional first! # Clear build directory, but do a conditional first!
if [ -d "./build" ]; then if [ -d "./build" ]; then