This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit fbe2176a9cd92fea64a4feb21360d465fd9a8f25 Author: Gabor Gyimesi <[email protected]> AuthorDate: Thu Aug 17 12:48:59 2023 +0200 MINIFICPP-2184 Update CMake to latest version on all Ubuntu versions Closes #1630 Signed-off-by: Marton Szasz <[email protected]> --- aptitude.sh | 10 ++++------ bootstrap.sh | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/aptitude.sh b/aptitude.sh index 77a3d34d9..80f800a82 100644 --- a/aptitude.sh +++ b/aptitude.sh @@ -33,12 +33,10 @@ add_os_flags() { } bootstrap_cmake(){ ## on Ubuntu install the latest CMake - if [[ "$OS" = Ubuntu* && "$OS_MAJOR" -lt 22 ]]; then - echo "Adding KitWare CMake apt repository..." - sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - - sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -c --short) main" && sudo apt-get update - fi + echo "Adding KitWare CMake apt repository..." + sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget + wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - + sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -c --short) main" && sudo apt-get update sudo apt-get -y install cmake } bootstrap_compiler() { diff --git a/bootstrap.sh b/bootstrap.sh index 48f2fb76c..54d809c2a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,7 +19,7 @@ script_directory="$(cd "$(dirname "$0")" && pwd)" CMAKE_GLOBAL_MIN_VERSION_MAJOR=3 -CMAKE_GLOBAL_MIN_VERSION_MINOR=17 +CMAKE_GLOBAL_MIN_VERSION_MINOR=24 CMAKE_GLOBAL_MIN_VERSION_REVISION=0 export RED='\033[0;101m'
