mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add c++14 test run with travis-CI using clang-10.

Browse Source
This commit is contained in:
asuessenbach 2020-07-30 09:21:05 +02:00
parent a2e754accb
commit 95ff3bca61
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.travis.yml
View File

@ -19,6 +19,7 @@ matrix:
env: env:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
- ADDITIONAL_BUILD_OPTIONS="-DSAMPLES_BUILD=OFF" - ADDITIONAL_BUILD_OPTIONS="-DSAMPLES_BUILD=OFF"
- CXX_STANDARD="11"
compiler: g++-5 compiler: g++-5
- os: linux - os: linux
@ -33,6 +34,7 @@ matrix:
- libglu1-mesa-dev - libglu1-mesa-dev
env: env:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
- CXX_STANDARD="11"
compiler: g++-6 compiler: g++-6
- os: linux - os: linux
@ -47,6 +49,7 @@ matrix:
- libglu1-mesa-dev - libglu1-mesa-dev
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- CXX_STANDARD="11"
compiler: g++-7 compiler: g++-7
- os: linux - os: linux
@ -61,6 +64,7 @@ matrix:
- libglu1-mesa-dev - libglu1-mesa-dev
env: env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
- CXX_STANDARD="11"
compiler: g++-8 compiler: g++-8
- os: linux - os: linux
@ -75,6 +79,7 @@ matrix:
- libglu1-mesa-dev - libglu1-mesa-dev
env: env:
- MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9"
- CXX_STANDARD="11"
compiler: g++-9 compiler: g++-9
- os: linux - os: linux
@ -89,6 +94,7 @@ matrix:
- libglu1-mesa-dev - libglu1-mesa-dev
env: env:
- MATRIX_EVAL="CC=gcc-10 && CXX=g++-10" - MATRIX_EVAL="CC=gcc-10 && CXX=g++-10"
- CXX_STANDARD="11"
compiler: g++-10 compiler: g++-10
- os: linux - os: linux
@ -105,6 +111,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-4.0 compiler: clang++-4.0
- os: linux - os: linux
@ -121,6 +129,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-5.0 compiler: clang++-5.0
- os: linux - os: linux
@ -137,6 +147,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-6.0 compiler: clang++-6.0
- os: linux - os: linux
@ -153,6 +165,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-7 compiler: clang++-7
- os: linux - os: linux
@ -169,6 +183,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-8 compiler: clang++-8
- os: linux - os: linux
@ -185,6 +201,8 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-9 compiler: clang++-9
- os: linux - os: linux
@ -201,6 +219,26 @@ matrix:
- ninja-build - ninja-build
- xorg-dev - xorg-dev
- libglu1-mesa-dev - libglu1-mesa-dev
env:
- CXX_STANDARD="11"
compiler: clang++-10
- os: linux
before_install:
- sudo apt-get update
- sudo apt-get purge g++
- sudo apt-get install clang-10
- CC=clang-10 && CXX=clang++-10
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- ninja-build
- xorg-dev
- libglu1-mesa-dev
env:
- CXX_STANDARD="14"
compiler: clang++-10 compiler: clang++-10
before_install: before_install:
@ -217,6 +255,7 @@ script:
-DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-DTESTS_BUILD_ONLY_DYNAMIC=ON -DTESTS_BUILD_ONLY_DYNAMIC=ON
-DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-DCMAKE_CXX_FLAGS="-std=c++11 -Wall -Wpedantic -Wextra" -DCMAKE_CXX_FLAGS="-Wall -Wpedantic -Wextra"
-DCMAKE_CXX_STANDARD=$CXX_STANDARD
$ADDITIONAL_BUILD_OPTIONS $ADDITIONAL_BUILD_OPTIONS
- cmake --build . - cmake --build .

7
CMakeLists.txt
View File

@ -53,7 +53,12 @@ else(MSVC)
add_compile_options(-Wall) add_compile_options(-Wall)
endif(MSVC) endif(MSVC)
set(CMAKE_CXX_STANDARD 11) if (NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
set(CXX_STANDARD_REQUIRED ON)
message("CMAKE_CXX_STANDARD = <${CMAKE_CXX_STANDARD}>")
if (NOT DEFINED VulkanRegistry_DIR) if (NOT DEFINED VulkanRegistry_DIR)
if (DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR) if (DEFINED VULKAN_HPP_VULKAN_HEADERS_SRC_DIR)