Parcourir la source

[fix] Update mysql-8.0

lj2007331@gmail.com il y a 4 ans
Parent
commit
d30ef621e8
2 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 1 0
      include/check_sw.sh
  2. 2 1
      include/mysql-8.0.sh

+ 1 - 0
include/check_sw.sh

@@ -82,6 +82,7 @@ installDepsCentOS() {
   for Package in ${pkgList}; do
     yum -y install ${Package}
   done
+  [ ${CentOS_ver} -lt 8 >/dev/null 2>&1 ] && yum -y install cmake3
 
   yum -y update bash openssl glibc
 }

+ 2 - 1
include/mysql-8.0.sh

@@ -25,7 +25,8 @@ Install_MySQL80() {
     tar xzf boost_${boostVersion2}.tar.gz
     tar xzf mysql-${mysql80_ver}.tar.gz
     pushd mysql-${mysql80_ver}
-    cmake . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
+    [ -e "/usr/bin/cmake3" ] && CMAKE=cmake3 || CMAKE=cmake
+    $CMAKE . -DCMAKE_INSTALL_PREFIX=${mysql_install_dir} \
     -DMYSQL_DATADIR=${mysql_data_dir} \
     -DDOWNLOAD_BOOST=1 \
     -DWITH_BOOST=../boost_${boostVersion2} \