From f6c8469c338536725feca2755b99d4902d6941ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 18 Jun 2021 10:50:34 +0200
Subject: [PATCH] [pthreads] Fix debug dll look-up path

---
 ports/pthreads/vcpkg-cmake-wrapper.cmake | 9 ++++++---
 ports/pthreads/vcpkg.json                | 2 +-
 versions/baseline.json                   | 2 +-
 versions/p-/pthreads.json                | 5 +++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ports/pthreads/vcpkg-cmake-wrapper.cmake b/ports/pthreads/vcpkg-cmake-wrapper.cmake
index 12d390a7ae2182..f9818d38456d1b 100644
--- a/ports/pthreads/vcpkg-cmake-wrapper.cmake
+++ b/ports/pthreads/vcpkg-cmake-wrapper.cmake
@@ -77,13 +77,16 @@ mark_as_advanced(PThreads4W_INCLUDE_DIR PThreads4W_LIBRARY PThreads4W_CXXEXC_LIB
 set(PThreads4W_DLL_DIR ${PThreads4W_INCLUDE_DIR})
 list(TRANSFORM PThreads4W_DLL_DIR APPEND "/../bin")
 message(STATUS "PThreads4W_DLL_DIR: ${PThreads4W_DLL_DIR}")
+set(PThreads4W_DEBUG_DLL_DIR ${PThreads4W_INCLUDE_DIR})
+list(TRANSFORM PThreads4W_DEBUG_DLL_DIR APPEND "/../debug/bin")
+message(STATUS "PThreads4W_DEBUG_DLL_DIR: ${PThreads4W_DEBUG_DLL_DIR}")
 
 find_file(PThreads4W_LIBRARY_RELEASE_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR})
-find_file(PThreads4W_LIBRARY_DEBUG_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR})
+find_file(PThreads4W_LIBRARY_DEBUG_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR})
 find_file(PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR})
-find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR})
+find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR})
 find_file(PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR})
-find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR})
+find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR})
 
 #Compatibility definitions, deprecated
 set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "")
diff --git a/ports/pthreads/vcpkg.json b/ports/pthreads/vcpkg.json
index 77b950b1422229..db809649bf64b0 100644
--- a/ports/pthreads/vcpkg.json
+++ b/ports/pthreads/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pthreads",
   "version": "3.0.0",
-  "port-version": 9,
+  "port-version": 10,
   "description": "pthreads for windows",
   "homepage": "https://sourceware.org/pub/pthreads-win32/"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index c46e2c457b2618..0ba06bbbdcbd11 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5018,7 +5018,7 @@
     },
     "pthreads": {
       "baseline": "3.0.0",
-      "port-version": 9
+      "port-version": 10
     },
     "pugixml": {
       "baseline": "1.11.4",
diff --git a/versions/p-/pthreads.json b/versions/p-/pthreads.json
index d80291862bc950..78edfdfedfaacc 100644
--- a/versions/p-/pthreads.json
+++ b/versions/p-/pthreads.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ab9d25f08115355ea2d4e4c6eae94626fa86fded",
+      "version": "3.0.0",
+      "port-version": 10
+    },
     {
       "git-tree": "f5b91f46526fb5abd97b07febd2563f3a3688769",
       "version": "3.0.0",