This repository was archived by the owner on Aug 11, 2023. It is now read-only.
Commit 8bbea92
committed
Update SDK to ComputeCpp v2.0.0
The name of the ComputeCpp library has changed on Windows. Since
we are supporting MSVC 2019 now, we need to include the compiler
checks to make it work, and also need an update to Google Test
to avoid a deprecation in MSVC.
Additionally, targets which use the ComputeCpp library are now forced
to have their linker language set as C++. The makes sure that (for
example) the platform C++ library is linked to the target, even if
not set by the user code.1 parent 3299025 commit 8bbea92
3 files changed
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,6 @@ | |||
| 1 | 1 | #!/bin/bash | |
| 2 | 2 | ||
| 3 | 3 | set -ev | |
| 4 | - wget --no-check-certificate https://computecpp.codeplay.com/downloads/computecpp-ce/1.3.0/ubuntu-16.04-64bit.tar.gz | ||
| 4 | + wget --no-check-certificate https://computecpp.codeplay.com/downloads/computecpp-ce/2.0.0/x86_64-linux-gnu.tar.gz | ||
| 5 | 5 | mkdir -p /tmp/computecpp | |
| 6 | - tar -xzf ubuntu-16.04-64bit.tar.gz -C /tmp/computecpp --strip-components=1 | ||
| 6 | + tar -xzf x86_64-linux-gnu.tar.gz -C /tmp/computecpp --strip-components=1 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -80,7 +80,7 @@ find_library(COMPUTECPP_RUNTIME_LIBRARY | |||
| 80 | 80 | DOC "ComputeCpp Runtime Library") | |
| 81 | 81 | ||
| 82 | 82 | find_library(COMPUTECPP_RUNTIME_LIBRARY_DEBUG | |
| 83 | - NAMES ComputeCpp ComputeCpp_vs2015_d | ||
| 83 | + NAMES ComputeCpp_d ComputeCpp ComputeCpp_vs2015_d | ||
| 84 | 84 | HINTS ${computecpp_find_hint} | |
| 85 | 85 | PATH_SUFFIXES lib | |
| 86 | 86 | DOC "ComputeCpp Debug Runtime Library") | |
@@ -154,6 +154,8 @@ endif() | |||
| 154 | 154 | list(APPEND COMPUTECPP_DEVICE_COMPILER_FLAGS -sycl-target ${COMPUTECPP_BITCODE}) | |
| 155 | 155 | message(STATUS "compute++ flags - ${COMPUTECPP_DEVICE_COMPILER_FLAGS}") | |
| 156 | 156 | ||
| 157 | + include(ComputeCppCompilerChecks) | ||
| 158 | + | ||
| 157 | 159 | if(NOT TARGET OpenCL::OpenCL) | |
| 158 | 160 | add_library(OpenCL::OpenCL UNKNOWN IMPORTED) | |
| 159 | 161 | set_target_properties(OpenCL::OpenCL PROPERTIES | |
@@ -399,6 +401,8 @@ function(add_sycl_to_target) | |||
| 399 | 401 | ${ARGN} | |
| 400 | 402 | ) | |
| 401 | 403 | ||
| 404 | + set_target_properties(${SDK_ADD_SYCL_TARGET} PROPERTIES LINKER_LANGUAGE CXX) | ||
| 405 | + | ||
| 402 | 406 | # If the CXX compiler is set to compute++ enable the driver. | |
| 403 | 407 | get_filename_component(cmakeCxxCompilerFileName "${CMAKE_CXX_COMPILER}" NAME) | |
| 404 | 408 | if("${cmakeCxxCompilerFileName}" STREQUAL "compute++") | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ find_package(Threads) | |||
| 4 | 4 | include(ExternalProject) | |
| 5 | 5 | ExternalProject_Add(googletest | |
| 6 | 6 | GIT_REPOSITORY https://github.com/google/googletest.git | |
| 7 | - GIT_TAG release-1.8.0 | ||
| 7 | + GIT_TAG release-1.10.0 | ||
| 8 | 8 | SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" | |
| 9 | 9 | BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" | |
| 10 | 10 | CONFIGURE_COMMAND "" | |
0 commit comments