diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-05-22 21:44:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 21:44:40 -0700 |
| commit | adfbc44bcceb1bdc59b504c0f2e4e134c74821b7 (patch) | |
| tree | 943eb0c72de5ef59b32803176e1f56142ed6e8b8 | |
| parent | 0bcd82c7ed4178b7e2940e3662c771b4ccb6992e (diff) | |
| parent | 7b32de6d9bb6074dced29ec97a022b884066c651 (diff) | |
| download | vcpkg-adfbc44bcceb1bdc59b504c0f2e4e134c74821b7.tar.gz vcpkg-adfbc44bcceb1bdc59b504c0f2e4e134c74821b7.zip | |
Merge pull request #6568 from Neumann-A/fix_pthreads
[pthreads] remove debug/release libs from release/debug folder
| -rw-r--r-- | ports/pthreads/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pthreads/portfile.cmake | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index a2fa46f02..70f3af246 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,3 @@ Source: pthreads -Version: 3.0.0 +Version: 3.0.0-1 Description: pthreads for windows diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 4cb157da6..4debe0d26 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -55,6 +55,7 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVSE3d.dll") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3d.lib") @@ -62,6 +63,13 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib") |