From dd56066e291545e6885cecb06ef29d6474824fc3 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 16 Oct 2017 19:31:06 -0500 Subject: [PATCH 1/5] FIX: pthreads: also install "pthreads.lib" --- ports/pthreads/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index cabf8a39b3..5d7daa7927 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -32,3 +32,8 @@ foreach(HEADER ${HEADERS}) endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) +file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/pthreadsVC2.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME pthreads.lib +) From ea30f9a378a6b9fd04bb03aa298ef80d6bff9b65 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 16 Oct 2017 19:33:14 -0500 Subject: [PATCH 2/5] FIX: typo --- ports/pthreads/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 5d7daa7927..0ed6f672a8 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -32,7 +32,7 @@ foreach(HEADER ${HEADERS}) endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) -file(RENAME +file(COPY ${CURRENT_PACKAGES_DIR}/lib/pthreadsVC2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pthreads.lib From bc959ccd8b8277acdbad869a753f074f8f8a0a4d Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 16 Oct 2017 20:44:37 -0500 Subject: [PATCH 3/5] FIX: switch to install --- ports/pthreads/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 0ed6f672a8..d07e23ef48 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -32,7 +32,7 @@ foreach(HEADER ${HEADERS}) endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) -file(COPY +file(INSTALL ${CURRENT_PACKAGES_DIR}/lib/pthreadsVC2.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pthreads.lib From 4259fc14849d5671c56d0ecb030d69feee1cee70 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 16 Oct 2017 20:49:13 -0500 Subject: [PATCH 4/5] FIX: also install the debug library --- ports/pthreads/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index d07e23ef48..cda6efb327 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -37,3 +37,8 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pthreads.lib ) +file(INSTALL + ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadsVC2d.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME pthreads.lib +) From 50402e91cb46a619b06a2c63d23c693a7b4f563c Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 17 Oct 2017 17:31:24 -0500 Subject: [PATCH 5/5] FIX: use alias folder --- ports/pthreads/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index cda6efb327..cddb3f4110 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -34,11 +34,11 @@ endforeach() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) file(INSTALL ${CURRENT_PACKAGES_DIR}/lib/pthreadsVC2.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link RENAME pthreads.lib ) file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadsVC2d.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link RENAME pthreads.lib )