mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-23 13:45:04 +02:00
.github/workflows/linux.bash: make $CMAKE_OPTS an array
to have less to care about quoting.
This commit is contained in:
parent
84f719ee4f
commit
4227d427da
6
.github/workflows/linux.bash
vendored
6
.github/workflows/linux.bash
vendored
@ -4,7 +4,7 @@ set -exo pipefail
|
|||||||
export PATH="/usr/lib/ccache:/usr/lib64/ccache:$PATH"
|
export PATH="/usr/lib/ccache:/usr/lib64/ccache:$PATH"
|
||||||
export CCACHE_DIR=/icinga2/ccache
|
export CCACHE_DIR=/icinga2/ccache
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
export CTEST_OUTPUT_ON_FAILURE=1
|
||||||
CMAKE_OPTS=''
|
CMAKE_OPTS=()
|
||||||
|
|
||||||
case "$DISTRO" in
|
case "$DISTRO" in
|
||||||
amazonlinux:2)
|
amazonlinux:2)
|
||||||
@ -24,7 +24,7 @@ case "$DISTRO" in
|
|||||||
|
|
||||||
ln -vs /usr/bin/cmake3 /usr/local/bin/cmake
|
ln -vs /usr/bin/cmake3 /usr/local/bin/cmake
|
||||||
ln -vs /usr/bin/ninja-build /usr/local/bin/ninja
|
ln -vs /usr/bin/ninja-build /usr/local/bin/ninja
|
||||||
CMAKE_OPTS='-DBOOST_INCLUDEDIR=/boost_1_69_0 -DBOOST_LIBRARYDIR=/boost_1_69_0/stage/lib'
|
CMAKE_OPTS+=(-DBOOST_{INCLUDEDIR=/boost_1_69_0,LIBRARYDIR=/boost_1_69_0/stage/lib})
|
||||||
export LD_LIBRARY_PATH=/boost_1_69_0/stage/lib
|
export LD_LIBRARY_PATH=/boost_1_69_0/stage/lib
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -76,7 +76,7 @@ cmake \
|
|||||||
-DUSE_SYSTEMD=ON \
|
-DUSE_SYSTEMD=ON \
|
||||||
-DICINGA2_USER=$(id -un) \
|
-DICINGA2_USER=$(id -un) \
|
||||||
-DICINGA2_GROUP=$(id -gn) \
|
-DICINGA2_GROUP=$(id -gn) \
|
||||||
$CMAKE_OPTS ..
|
"${CMAKE_OPTS[@]}" ..
|
||||||
|
|
||||||
ninja -v
|
ninja -v
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user