maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-cmake3-rhel' into integration_2023_w32

Browse Source
This commit is contained in:
Robert Schmidt
2023-08-11 11:03:11 +02:00
parent 934a6aeb83 3161add2c1
commit b141450180
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/build_oai
+1 -1
View File
@@ -529,7 +529,7 @@ function main() {
echo_info "Doxygen generation log is located here: $doxygen_log" echo_info "Doxygen generation log is located here: $doxygen_log"
echo_info "Generating Doxygen files....please wait" echo_info "Generating Doxygen files....please wait"
( (
cmake --build . --target doc $CMAKE --build . --target doc
) >& $doxygen_log ) >& $doxygen_log
fi fi
cmake_targets/tools/build_helper
+3 -3
View File
@@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g") OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
case "$OS_DISTRO" in case "$OS_DISTRO" in
fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;;
rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;; centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
@@ -226,11 +226,11 @@ compilations() {
local verbose=$([ "$VERBOSE_COMPILE" == "1" ] && echo "-v" || echo "") local verbose=$([ "$VERBOSE_COMPILE" == "1" ] && echo "-v" || echo "")
echo cd $OPENAIR_DIR/cmake_targets/$dir/build echo cd $OPENAIR_DIR/cmake_targets/$dir/build
cd $OPENAIR_DIR/cmake_targets/$dir/build cd $OPENAIR_DIR/cmake_targets/$dir/build
echo_info "Running \"cmake --build . $verbose --target $targets -- -j$(nproc)\"" $green echo_info "Running \"$CMAKE --build . $verbose --target $targets -- -j$(nproc)\"" $green
echo "Log file for compilation is being written to: $dlog/$logfile" echo "Log file for compilation is being written to: $dlog/$logfile"
set +e set +e
{ {
cmake --build . $verbose --target $targets -- -j$(nproc) $CMAKE --build . $verbose --target $targets -- -j$(nproc)
ret=$? ret=$?
} > $dlog/$logfile 2>&1 } > $dlog/$logfile 2>&1
if [ "$VERBOSE_CI" == "1" ]; then if [ "$VERBOSE_CI" == "1" ]; then