[clblast] Fix static build (#23943)

* [clblast] Fix static build

* version

* Fix config path

* version

* Fix release only builds

* version
This commit is contained in:
Thomas1664 2022-04-06 23:42:04 +02:00 committed by GitHub
parent eaed2c31f3
commit 59facb4cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 18 deletions

View File

@ -8,30 +8,23 @@ vcpkg_from_github(
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DTUNERS=OFF
) )
vcpkg_cmake_install() vcpkg_cmake_install()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll")
if(VCPKG_TARGET_IS_WINDOWS)
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/clblast.dll") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll")
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll")
endif() endif()
file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
if(EXE OR DEBUG_EXE)
file(REMOVE ${EXE} ${DEBUG_EXE})
endif()
endif() endif()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clblast) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()

View File

@ -1,10 +1,10 @@
{ {
"name": "clblast", "name": "clblast",
"version": "1.5.2", "version": "1.5.2",
"port-version": 1, "port-version": 2,
"description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.",
"homepage": "https://github.com/CNugteren/CLBlast", "homepage": "https://github.com/CNugteren/CLBlast",
"supports": "!static", "license": "Apache-2.0",
"dependencies": [ "dependencies": [
"opencl", "opencl",
{ {

View File

@ -1398,7 +1398,7 @@
}, },
"clblast": { "clblast": {
"baseline": "1.5.2", "baseline": "1.5.2",
"port-version": 1 "port-version": 2
}, },
"clfft": { "clfft": {
"baseline": "2.12.2", "baseline": "2.12.2",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0",
"version": "1.5.2",
"port-version": 2
},
{ {
"git-tree": "e85773ea54da7675b468d6fd479871899667aa3a", "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a",
"version": "1.5.2", "version": "1.5.2",