diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/clblas | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/clblas')
| -rw-r--r-- | ports/clblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/clblas/portfile.cmake | 38 |
2 files changed, 16 insertions, 24 deletions
diff --git a/ports/clblas/CONTROL b/ports/clblas/CONTROL index 3837fcbca..3e8543409 100644 --- a/ports/clblas/CONTROL +++ b/ports/clblas/CONTROL @@ -1,4 +1,4 @@ Source: clblas -Version: 2.12-2 +Version: 2.12-3 Build-Depends: opencl Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library. diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index daefb8388..97bd7c936 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -6,18 +6,13 @@ vcpkg_from_github( REF v2.12 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72 HEAD_REF master + PATCHES + cmake.patch ) # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names # conflicting with the built-in, more modern FindOpenCL.cmake -file( - REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch -) +file(REMOVE ${SOURCE_PATH}/src/FindOpenCL.cmake) vcpkg_find_acquire_program(PYTHON3) @@ -37,26 +32,23 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL - "${SOURCE_PATH}/LICENSE" - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/clblas - RENAME copyright -) - if(VCPKG_TARGET_IS_WINDOWS) file(REMOVE - ${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 + ${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() +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(VCPKG_TARGET_IS_LINUX) - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/clBLAS") +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clBLAS) endif() vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clblas RENAME copyright) |