[clblas] Fix build error (#8919)

* [clblas] Fix build error

* [clblas] Fix build error

* Remove include(vcpkg_common_functions)
This commit is contained in:
Lily 2020-02-05 06:11:19 +08:00 committed by GitHub
parent ed863b163c
commit 09b6a74b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions

View File

@ -1,4 +1,4 @@
Source: clblas Source: clblas
Version: 2.12-3 Version: 2.12-4
Build-Depends: opencl Build-Depends: opencl
Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library. Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.

View File

@ -0,0 +1,16 @@
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index f2d5a88..8f84133 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -910,11 +910,6 @@ endif( )
include( InstallRequiredSystemLibraries )
-# Install necessary runtime files for debug builds
-install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
- CONFIGURATIONS Debug
- DESTINATION ${CLBLAS_RUNTIME_DESTINATION} )
-
# Install all *.pdb files for debug builds
install( DIRECTORY ${PROJECT_BINARY_DIR}/staging/
DESTINATION ${CLBLAS_RUNTIME_DESTINATION}

View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO clMathLibraries/clBLAS REPO clMathLibraries/clBLAS
@ -8,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
PATCHES PATCHES
cmake.patch cmake.patch
Fix-BuildDLL.patch
) )
# v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
@ -37,9 +36,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.pdb
${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe ${CURRENT_PACKAGES_DIR}/debug/bin/clBLAS-tune.exe
${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe ${CURRENT_PACKAGES_DIR}/bin/clBLAS-tune.exe
${CURRENT_PACKAGES_DIR}/debug/bin/concrt140d.dll
${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140d.dll
${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140d.dll
) )
endif() endif()