diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-02-05 06:11:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 14:11:19 -0800 |
| commit | 09b6a74b43030ef8163079d0b2ae44bf7f3b26d1 (patch) | |
| tree | 69e93662a13097bc68eb741ba5f592b5f08e21ff | |
| parent | ed863b163c1909bdc33587174f6bb8e9cb170310 (diff) | |
| download | vcpkg-09b6a74b43030ef8163079d0b2ae44bf7f3b26d1.tar.gz vcpkg-09b6a74b43030ef8163079d0b2ae44bf7f3b26d1.zip | |
[clblas] Fix build error (#8919)
* [clblas] Fix build error
* [clblas] Fix build error
* Remove include(vcpkg_common_functions)
| -rw-r--r-- | ports/clblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/clblas/Fix-BuildDLL.patch | 16 | ||||
| -rw-r--r-- | ports/clblas/portfile.cmake | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/ports/clblas/CONTROL b/ports/clblas/CONTROL index 3e8543409..bd4d8a552 100644 --- a/ports/clblas/CONTROL +++ b/ports/clblas/CONTROL @@ -1,4 +1,4 @@ Source: clblas -Version: 2.12-3 +Version: 2.12-4 Build-Depends: opencl Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library. diff --git a/ports/clblas/Fix-BuildDLL.patch b/ports/clblas/Fix-BuildDLL.patch new file mode 100644 index 000000000..f717c28dc --- /dev/null +++ b/ports/clblas/Fix-BuildDLL.patch @@ -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} diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index 97bd7c936..eeeb71c3f 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO clMathLibraries/clBLAS @@ -8,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES cmake.patch + Fix-BuildDLL.patch ) # 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.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() |