From 59facb4cf71bff961a7a7fe18ffa07539c19183f Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Wed, 6 Apr 2022 23:42:04 +0200
Subject: [PATCH] [clblast] Fix static build (#23943)

* [clblast] Fix static build

* version

* Fix config path

* version

* Fix release only builds

* version
---
 ports/clblast/portfile.cmake | 23 ++++++++---------------
 ports/clblast/vcpkg.json     |  4 ++--
 versions/baseline.json       |  2 +-
 versions/c-/clblast.json     |  5 +++++
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake
index 72b414d9164..74e7e3d4b87 100644
--- a/ports/clblast/portfile.cmake
+++ b/ports/clblast/portfile.cmake
@@ -8,30 +8,23 @@ vcpkg_from_github(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DTUNERS=OFF
 )
 
 vcpkg_cmake_install()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/clblast.dll")
-        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")
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll")
+    
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll")
     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()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clblast)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast)
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json
index 5f90075e1b1..bc77f3498f5 100644
--- a/ports/clblast/vcpkg.json
+++ b/ports/clblast/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "clblast",
   "version": "1.5.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.",
   "homepage": "https://github.com/CNugteren/CLBlast",
-  "supports": "!static",
+  "license": "Apache-2.0",
   "dependencies": [
     "opencl",
     {
diff --git a/versions/baseline.json b/versions/baseline.json
index 5a94b6294b6..b07a36c205c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1398,7 +1398,7 @@
     },
     "clblast": {
       "baseline": "1.5.2",
-      "port-version": 1
+      "port-version": 2
     },
     "clfft": {
       "baseline": "2.12.2",
diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json
index d6f21f9022e..8ae9e3d638a 100644
--- a/versions/c-/clblast.json
+++ b/versions/c-/clblast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0",
+      "version": "1.5.2",
+      "port-version": 2
+    },
     {
       "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a",
       "version": "1.5.2",