tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GHA: use a CMake version which can set(CMAKE_CXX_STANDARD 17) where possible 

especially on Amazon Linux which seems to have trouble with our workaround:
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
This commit is contained in:
Alexander A. Klimov 2023-05-02 15:22:06 +02:00
parent 8238ec0d96
commit 59d07ec03c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/linux.bash vendored
View File

@ -9,7 +9,7 @@ CMAKE_OPTS=''
case "$DISTRO" in case "$DISTRO" in
amazonlinux:*) amazonlinux:*)
amazon-linux-extras install -y epel amazon-linux-extras install -y epel
yum install -y bison ccache cmake gcc-c++ flex ninja-build \ yum install -y bison ccache cmake3 gcc-c++ flex ninja-build \
{libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel {libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel
yum install -y bzip2 tar wget yum install -y bzip2 tar wget
@ -22,6 +22,7 @@ case "$DISTRO" in
./b2 ./b2
) )
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 -DBOOST_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
@ -29,9 +30,10 @@ case "$DISTRO" in
centos:*) centos:*)
yum install -y centos-release-scl epel-release yum install -y centos-release-scl epel-release
yum install -y bison ccache cmake devtoolset-11-gcc-c++ flex ninja-build \ yum install -y bison ccache cmake3 devtoolset-11-gcc-c++ flex ninja-build \
{boost169,libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel {boost169,libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel
ln -vs /usr/bin/cmake3 /usr/local/bin/cmake
ln -vs /usr/bin/ccache /usr/lib64/ccache/g++ ln -vs /usr/bin/ccache /usr/lib64/ccache/g++
CMAKE_OPTS='-DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169' CMAKE_OPTS='-DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169'
;; ;;