diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-06-21 22:33:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 13:33:46 -0700 |
| commit | 831381a1474f6f4b931355b3659a74876d1c05cd (patch) | |
| tree | 7c202df87d3efa17980738d769e71228010d0f08 | |
| parent | c527fabf35507e8e8a09654825101d3382f2f7a0 (diff) | |
| download | vcpkg-831381a1474f6f4b931355b3659a74876d1c05cd.tar.gz vcpkg-831381a1474f6f4b931355b3659a74876d1c05cd.zip | |
[pthreads] Fix debug dll look-up path (#18528)
| -rw-r--r-- | ports/pthreads/vcpkg-cmake-wrapper.cmake | 9 | ||||
| -rw-r--r-- | ports/pthreads/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | 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 12d390a7a..f9818d384 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 77b950b14..db809649b 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 8a36bfc9d..751cfa64d 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 d80291862..78edfdfed 100644 --- a/versions/p-/pthreads.json +++ b/versions/p-/pthreads.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ab9d25f08115355ea2d4e4c6eae94626fa86fded", + "version": "3.0.0", + "port-version": 10 + }, + { "git-tree": "f5b91f46526fb5abd97b07febd2563f3a3688769", "version": "3.0.0", "port-version": 9 |