Skip to content
Snippets Groups Projects
Commit 18a73adc authored by Dmitry Puzyrkov's avatar Dmitry Puzyrkov
Browse files

Merge branch 'hotfix-15644' into 'master'

changed order in which flags are added for DBUILD_DIAGTOOL

See merge request cellframe/prod_build_cellframe-node!53
parents 2abae853 a82828b3
No related branches found
No related tags found
No related merge requests found
......@@ -115,15 +115,15 @@ fi
# Add -DBUILD_DIAGTOOL=ON if the target is windows
if [ "$BUILD_TARGET" == "windows" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
BUILD_OPTIONS=("-DBUILD_DIAGTOOL=ON" "${BUILD_OPTIONS[@]}")
fi
# Add -DBUILD_DIAGTOOL=ON the target is linux
if [ "$BUILD_TARGET" == "linux" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
BUILD_OPTIONS=("-DBUILD_DIAGTOOL=ON" "${BUILD_OPTIONS[@]}")
fi
# Add -DBUILD_DIAGTOOL=ON the target is osx
if [ "$BUILD_TARGET" == "osx" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
BUILD_OPTIONS=("-DBUILD_DIAGTOOL=ON" "${BUILD_OPTIONS[@]}")
fi
#all base logic from here
mkdir -p ${BUILD_DIR}/build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment