Skip to content

Commit 569b7e0

Browse files
authored
Merge branch 'ocl-open-110' into ocl-open-110
2 parents 4378a44 + 51fd5b9 commit 569b7e0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ branches:
1616

1717
env:
1818
global:
19-
- LLVM_VERSION=11
19+
- LLVM_VERSION=12
2020
matrix:
2121
- BUILD_TYPE=Release
2222
- BUILD_TYPE=Debug

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
2020
add_definitions(-DUSE_PREBUILT_LLVM)
2121

2222
if(NOT PREFERRED_LLVM_VERSION)
23-
set(PREFERRED_LLVM_VERSION "11.0.0")
23+
set(PREFERRED_LLVM_VERSION "12.0.0")
2424
endif(NOT PREFERRED_LLVM_VERSION)
2525
message(STATUS "Looking for LLVM version ${PREFERRED_LLVM_VERSION}")
2626
find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED)

0 commit comments

Comments
 (0)