From 12e09b01fdd166b71e7bf8573d0df668bb2c12e2 Mon Sep 17 00:00:00 2001 From: Mike Weiblen Date: Tue, 16 Jul 2019 15:16:00 -0600 Subject: build: Update cmake_minimum_required(VERSION 3.10.2) Change-Id: Idb7a32a2bf08d9d5418f3288c9ccc50ee1f0a723 --- BUILD.md | 12 ++++++------ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BUILD.md b/BUILD.md index 2c69cef77..d164825c2 100644 --- a/BUILD.md +++ b/BUILD.md @@ -250,7 +250,7 @@ generate the native platform files. - [2017](https://www.visualstudio.com/vs/downloads/) - The Community Edition of each of the above versions is sufficient, as well as any more capable edition. -- CMake: Continuous integration tools use [CMake 3.12.2](https://github.com/Kitware/CMake/releases/tag/v3.12.2) for Windows +- [CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-win64-x64.zip) is recommended. - Use the installer option to add CMake to the system PATH - Git Client Support - [Git for Windows](http://git-scm.com/download/win) is a popular solution @@ -433,11 +433,11 @@ that the minimum supported compiler versions are GCC 4.8.2 and Clang 3.4, although earlier versions may work. It should be straightforward to adapt this repository to other Linux distributions. -The continuous integration tools use [CMake 3.12.4](https://github.com/Kitware/CMake/releases/tag/v3.12.4) for Linux +[CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz) is recommended. #### Required Package List - sudo apt-get install git cmake build-essential libx11-xcb-dev \ + sudo apt-get install git build-essential libx11-xcb-dev \ libxkbcommon-dev libwayland-dev libxrandr-dev \ libegl1-mesa-dev @@ -679,7 +679,7 @@ Setup Homebrew and components - Add packages with the following: - brew install cmake python + brew install python ### Android Build @@ -748,7 +748,7 @@ validation tests: Tested on OSX version 10.12.6 -The continuous integration tools use [CMake 3.11.3](https://github.com/Kitware/CMake/releases/tag/v3.11.3) for MacOS +[CMake 3.10.2](https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz) is recommended. Setup Homebrew and components @@ -762,7 +762,7 @@ Setup Homebrew and components - Add packages with the following (may need refinement) - brew install cmake python python3 git + brew install python python3 git ### Clone the Repository diff --git a/CMakeLists.txt b/CMakeLists.txt index 67da340f4..1f9b71005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # CMake project initialization --------------------------------------------------------------------------------------------------- # This section contains pre-project() initialization, and ends with the project() command. -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.10.2) # Apple: Must be set before enable_language() or project() as it may influence configuration of the toolchain and flags. set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version") -- cgit v1.2.3