summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kniager <jeremyk@lunarg.com>2019-03-21 09:48:32 -0600
committerjeremyk-lunarg <jeremyk@lunarg.com>2019-03-21 10:05:48 -0600
commit35cdb670f0146ff794c520bebe9c34fe294d58fe (patch)
tree3cc530cabfb0300af941d5eedb9b333831f7ae5b
parent101a891bf53908dd489bb7f8d3c4c154f3cc769c (diff)
downloadVulkan-Tools-35cdb670f0146ff794c520bebe9c34fe294d58fe.tar.gz
Vulkan-Tools-35cdb670f0146ff794c520bebe9c34fe294d58fe.tar.bz2
Vulkan-Tools-35cdb670f0146ff794c520bebe9c34fe294d58fe.zip
build: Update CMake version
Updated suggested CMake version for platforms in BUILD.md. Added CMake version output on Travis and AppVeyor. Change-Id: I128b17c85a8e4c8a5c1f334b818ea8171d9a7143
-rw-r--r--.appveyor.yml1
-rw-r--r--.travis.yml1
-rw-r--r--BUILD.md6
3 files changed, 7 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 281eb2e5..bb806b9a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,6 +25,7 @@ branches:
before_build:
- "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
- echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER%
+ - cmake --version
# Build Vulkan-Headers
- echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION%
- cd %APPVEYOR_BUILD_FOLDER%
diff --git a/.travis.yml b/.travis.yml
index ea522fbe..eee4dedf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,7 @@ before_install:
script:
- set -e
+ - cmake --version
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
# Build Vulkan-Headers
diff --git a/BUILD.md b/BUILD.md
index dc33fa67..23895cf2 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -197,7 +197,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](http://www.cmake.org/download/) (Version 2.8.11 or better)
+- [CMake](http://www.cmake.org/download/) (CI uses CMake 3.12.2)
- 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
@@ -349,6 +349,8 @@ repository to other Linux distributions.
sudo apt-get install git cmake build-essential libx11-xcb-dev \
libxkbcommon-dev libwayland-dev libxrandr-dev
+*Note: CI uses CMake 3.12.4*
+
### Linux Build
The general approach is to run CMake to generate make files. Then either run
@@ -701,6 +703,8 @@ Setup Homebrew and components
brew install cmake python python3 git
+*Note:* CI uses CMake 3.11.3
+
### Clone the Repository
Clone the Vulkan-Tools repository as defined above in the [Download the Repository](#download-the-repository)