aboutsummaryrefslogtreecommitdiff
path: root/ports/pthreads
diff options
context:
space:
mode:
authorgrdowns <grdowns@microsoft.com>2019-06-28 17:32:12 -0700
committergrdowns <grdowns@microsoft.com>2019-06-28 17:32:12 -0700
commite27fe911982284788e63f4a92339386554706a4b (patch)
treee695af1d6733cea93a29adab73ff819430ff872e /ports/pthreads
parent1586330395db0bfa14c40c4b1a8d4da6c8f7c5f7 (diff)
parent62ed7c17318b4f46109c2de73b7584fb04e85720 (diff)
downloadvcpkg-e27fe911982284788e63f4a92339386554706a4b.tar.gz
vcpkg-e27fe911982284788e63f4a92339386554706a4b.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump
Diffstat (limited to 'ports/pthreads')
-rw-r--r--ports/pthreads/CONTROL1
-rw-r--r--ports/pthreads/portfile.cmake10
2 files changed, 7 insertions, 4 deletions
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL
index 70f3af246..e1b96a438 100644
--- a/ports/pthreads/CONTROL
+++ b/ports/pthreads/CONTROL
@@ -1,3 +1,4 @@
Source: pthreads
Version: 3.0.0-1
+Homepage: https://sourceware.org/pub/pthreads-win32/
Description: pthreads for windows
diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake
index 4debe0d26..393fefddc 100644
--- a/ports/pthreads/portfile.cmake
+++ b/ports/pthreads/portfile.cmake
@@ -1,14 +1,16 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- message(FATAL_ERROR "${PORT} does not currently support UWP")
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ message(FATAL_ERROR "${PORT} does not currently support UWP platform nor ARM architectures")
endif()
-if(VCPKG_CMAKE_SYSTEM_NAME)
+
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
return()
endif()
set(PTHREADS4W_VERSION "3.0.0")
-include(vcpkg_common_functions)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v${PTHREADS4W_VERSION}.zip/download"
FILENAME "pthreads4w-code-v${PTHREADS4W_VERSION}.zip"