birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update minimum required CMake version to 3.20 (#1253)

Browse Source 
* Update the minimum CMake version to 3.20

Sets the cmake_minimum_required calls to version 3.20 and updates the
README.md to point at the general CMake download page instead of a stale
link.

* Remove unnecessary cmake minimum version

It was using an old 3.0 version and can be removed.

* Additional updates to CMake 3.20, build scripts

Updates the version and remove logic to find a CMake in 3rdParty.

* Removing backup path to ninja path in the build_ninja_windows.cmd

The backup path for finding ninja was coming from the Perforce depot which isn't available for o3de builds.

* Removing reference to 3rdParty Android SDK 29 from the build and run unit test script

The Android SDK is not part of the new 3rdParty system and users are expected to install the Android SDK on their own in order to build the engine for Android.

* Update the get_python scripts and README

No longer try to append a CMake path to LY_3RDPARTY_PATH, but do still
support LY_CMAKE_PATH because there are still uses of it.  Remove
mention of an LY_3RDPARTY_PATH-relative CMake path from the README.md.

* Removing LY_NINJA_PATH from the build_ninja_windows.cmd

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
This commit is contained in:
Eric Phister
2021-06-11 12:00:55 -05:00
committed by GitHub
parent f2db30c5d0
commit 0c7605c9b6
14 changed files with 28 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/get_python.bat
+5 -8
View File
@@ -32,18 +32,15 @@ IF !ERRORLEVEL!==0 (
cd /D %CMD_DIR%\..
REM IF you update this logic, update it in scripts/build/Platform/Windows/env_windows.cmd
REM If cmake is not found on path, try a known location, using LY_CMAKE_PATH as the first fallback
REM If cmake is not found on path, try a known location at LY_CMAKE_PATH
where /Q cmake
IF NOT !ERRORLEVEL!==0 (
IF "%LY_CMAKE_PATH%"=="" (
IF "%LY_3RDPARTY_PATH%"=="" (
ECHO ERROR: CMake was not found on the PATH and LY_3RDPARTY_PATH is not defined.
ECHO Please ensure CMake is on the path or set LY_3RDPARTY_PATH or LY_CMAKE_PATH.
EXIT /b 1
)
SET LY_CMAKE_PATH=!LY_3RDPARTY_PATH!\CMake\3.19.1\Windows\bin
echo CMake was not found on the path, will use known location: !LY_CMAKE_PATH!
ECHO ERROR: CMake was not found on the PATH and LY_CMAKE_PATH is not defined.
ECHO Please ensure CMake is on the path or set LY_CMAKE_PATH.
EXIT /b 1
)
PATH !LY_CMAKE_PATH!;!PATH!
where /Q cmake
if NOT !ERRORLEVEL!==0 (