Skip to content

Commit

Permalink
MINIFICPP-2184 Update CMake to latest version on all Ubuntu versions
Browse files Browse the repository at this point in the history
Closes #1630

Signed-off-by: Marton Szasz <[email protected]>
  • Loading branch information
lordgamez authored and szaszm committed Aug 17, 2023
1 parent 69558ff commit fbe2176
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 4 additions & 6 deletions aptitude.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit fbe2176

Please sign in to comment.