updated cmake scripts
This commit is contained in:
parent
9371451ced
commit
2432e64fb2
@ -19,9 +19,15 @@ os_fsfw="host"
|
|||||||
builddir="build-Debug"
|
builddir="build-Debug"
|
||||||
if [ "${OS}" = "Windows_NT" ]; then
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
build_generator="MinGW Makefiles"
|
build_generator="MinGW Makefiles"
|
||||||
|
python="py"
|
||||||
# Could be other OS but this works for now.
|
# Could be other OS but this works for now.
|
||||||
else
|
else
|
||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
|
python="python3"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
|
echo "Running command (without the leading +):"
|
||||||
|
set -x # Print command
|
||||||
|
"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
|
||||||
|
# Use this if commands are added which should not be printed
|
||||||
|
# set +x
|
@ -16,16 +16,18 @@ fi
|
|||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
os_fsfw="host"
|
os_fsfw="host"
|
||||||
builddir="build-Release"
|
builddir="build-Debug"
|
||||||
if [ "${OS}" = "Windows_NT" ]; then
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
build_generator="MinGW Makefiles"
|
build_generator="MinGW Makefiles"
|
||||||
|
python="py"
|
||||||
# Could be other OS but this works for now.
|
# Could be other OS but this works for now.
|
||||||
else
|
else
|
||||||
build_generator="Unix Makefiles"
|
build_generator="Unix Makefiles"
|
||||||
|
python="python3"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
set -x # Print command
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -l "${builddir}"
|
"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
@ -16,12 +16,17 @@ fi
|
|||||||
|
|
||||||
build_generator=""
|
build_generator=""
|
||||||
os_fsfw="host"
|
os_fsfw="host"
|
||||||
builddir="build-Release"
|
builddir="build-Debug"
|
||||||
|
build_generator="Ninja"
|
||||||
if [ "${OS}" = "Windows_NT" ]; then
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
build_generator="MinGW Makefiles"
|
python="py"
|
||||||
# Could be other OS but this works for now.
|
# Could be other OS but this works for now.
|
||||||
else
|
else
|
||||||
build_generator="Unix Makefiles"
|
python="python3"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
|
echo "Running command (without the leading +):"
|
||||||
|
set -x # Print command
|
||||||
|
"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
|
||||||
|
# Use this if commands are added which should not be printed
|
||||||
|
# set +x
|
@ -14,13 +14,19 @@ if [ "${counter}" -ge 5 ];then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
build_generator="Unix Makefiles"
|
build_generator=""
|
||||||
os_fsfw="linux"
|
os_fsfw="host"
|
||||||
builddir="build-Release"
|
builddir="build-Release"
|
||||||
|
build_generator="Ninja"
|
||||||
|
if [ "${OS}" = "Windows_NT" ]; then
|
||||||
|
python="py"
|
||||||
|
# Could be other OS but this works for now.
|
||||||
|
else
|
||||||
|
python="python3"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Running command (without the leading +):"
|
echo "Running command (without the leading +):"
|
||||||
set -x # Print command
|
set -x # Print command
|
||||||
python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" \
|
"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
|
||||||
-t "host/none" -l "${builddir}"
|
|
||||||
# Use this if commands are added which should not be printed
|
# Use this if commands are added which should not be printed
|
||||||
# set +x
|
# set +x
|
Loading…
Reference in New Issue
Block a user