From e9bbfc99a49ef18ce6e28d5285a296613c4fd247 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 May 2019 21:00:46 +0200 Subject: [pthreads] remove debug/release libs from release/debug folder --- ports/pthreads/CONTROL | 2 +- ports/pthreads/portfile.cmake | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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..e5333dad2 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -62,6 +62,14 @@ 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") @@ -69,6 +77,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3 From 7b32de6d9bb6074dced29ec97a022b884066c651 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Wed, 22 May 2019 21:02:18 +0200 Subject: whitespace changes --- ports/pthreads/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index e5333dad2..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") @@ -69,7 +70,6 @@ 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") @@ -77,7 +77,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") - endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") -- cgit v1.2.3