Skip to content

Commit

Permalink
Upgrade to llvm 10
Browse files Browse the repository at this point in the history
Switching travis environment to Ubuntu 18.04 Bionic
Upgrade to C++14 standard

Signed-off-by: Alexey Sotkin <alexey.sotkin@intel.com>
  • Loading branch information
AlexeySotkin committed Sep 12, 2019
1 parent 6f8c329 commit 812eb74
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: cpp
os:
- linux

# Use Ubuntu 16.04 LTS (Xenial) as the Linux testing environment.
dist: xenial
# Use Ubuntu 18.04 LTS (Bionic) as the Linux testing environment.
dist: bionic
sudo: false

git:
Expand All @@ -24,13 +24,14 @@ env:
addons:
apt:
sources:
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main'
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- ubuntu-toolchain-r-test
packages:
- llvm-9-tools
- llvm-9-dev
- libclang-9-dev
- llvm-10-tools
- llvm-10-dev
- libclang-10-dev
- lldb-10

install:
- wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/releases/download/dev-build/SPIRV-LLVM-Translator-dev-build-linux-Release.zip -O /tmp/SPIRV-LLVM-Translator-dev-build-linux-${BUILD_TYPE}.zip
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
add_definitions(-DUSE_PREBUILT_LLVM)

if(NOT PREFERRED_LLVM_VERSION)
set(PREFERRED_LLVM_VERSION "9.0.0")
set(PREFERRED_LLVM_VERSION "10.0.0")
endif(NOT PREFERRED_LLVM_VERSION)
message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)
Expand All @@ -32,7 +32,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
${CMAKE_MODULE_PATH}
${LLVM_CMAKE_DIR})

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

option(LLVMSPIRV_INCLUDED_IN_LLVM
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ make all -j`nproc`

##### Preferred LLVM version

By default, Common clang's cmake script is searching for LLVM 9.0.0. You can
By default, Common clang's cmake script is searching for LLVM 10.0.0. You can
override target version of LLVM by using `PREFERRED_LLVM_VERSION` cmake option:

Example:
```
cmake -DPREFERRED_LLVM_VERSION="9.0.0" ../opencl-clang
cmake -DPREFERRED_LLVM_VERSION="10.0.0" ../opencl-clang
```

##### Custom LLVM installation
Expand Down

0 comments on commit 812eb74

Please sign in to comment.