From ed74bb9166a73d8205a113dfcea6a68f3107018e Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Wed, 28 Apr 2021 16:10:34 -0700 Subject: [PATCH] SPEC-5380: Update windows/mac setup scripts to install latest cmake * Adding choco install for cmake in 'install_utiltools.ps1' * Adding brew installation command to install-xcode.sh --- scripts/build/build_node/Platform/Mac/install-xcode.sh | 5 ++++- .../build/build_node/Platform/Windows/install_utiltools.ps1 | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/build/build_node/Platform/Mac/install-xcode.sh b/scripts/build/build_node/Platform/Mac/install-xcode.sh index c55ebc38d3..3f744c0e57 100755 --- a/scripts/build/build_node/Platform/Mac/install-xcode.sh +++ b/scripts/build/build_node/Platform/Mac/install-xcode.sh @@ -43,4 +43,7 @@ sudo installer -pkg /Applications/Xcode.app/Contents/Resources/Packages/MobileDe sudo installer -pkg /Applications/Xcode.app/Contents/Resources/Packages/MobileDeviceDevelopment.pkg -target / echo "Enabling developer mode" -sudo /usr/sbin/DevToolsSecurity --enable \ No newline at end of file +sudo /usr/sbin/DevToolsSecurity --enable + +echo "Installing cmake" +brew install cmake diff --git a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 index 15cd92a7e2..4e3695d35d 100644 --- a/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 +++ b/scripts/build/build_node/Platform/Windows/install_utiltools.ps1 @@ -25,4 +25,7 @@ git config --global "credential.helper" "!aws codecommit credential-helper $@" git config --global "credential.UseHttpPath" "true" # Install Java (for Jenkins) -choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to handle cases where whitespace in the path is not quote wrapped \ No newline at end of file +choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to handle cases where whitespace in the path is not quote wrapped + +# Install CMake +choco install cmake -y --installargs 'ADD_CMAKE_TO_PATH=System'