diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-13 04:09:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 13:09:46 -0700 |
| commit | 83627767af5efc3e5a2903ffca54dc6acb00ca99 (patch) | |
| tree | d33bfb627d63b4eb6a6e0eceaf524059ee656134 /ports/pthreads | |
| parent | 250e35a961f6faea691e2266613e671a61bb3ab6 (diff) | |
| download | vcpkg-83627767af5efc3e5a2903ffca54dc6acb00ca99.tar.gz vcpkg-83627767af5efc3e5a2903ffca54dc6acb00ca99.zip | |
[vcpkg baseline] Fix baseline error (#11896)
* [tinyfiledialogs] Re-trigger CI test
* [msix] Fix source hash
* [geographiclib] Re-trigger CI test
* [soundtouch] Re-trigger CI test
* update baseline
* [plplot] Re-trigger CI test
* [dmlc] Fix issues with parallel configuration
* [tclap] Re-trigger CI test
* [itpp] Re-trigger CI test
* [mpg123] Re-trigger CI test
* [qwt] Re-trigger CI test
* [soundtouch] Re-trigger CI test
* [pthreads] Re-trigger CI test
Diffstat (limited to 'ports/pthreads')
| -rw-r--r-- | ports/pthreads/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pthreads/portfile.cmake | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index 19e2bd0ac..9726bcee2 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,5 +1,5 @@ Source: pthreads -Version: 3.0.0-4 +Version: 3.0.0-5 Homepage: https://sourceware.org/pub/pthreads-win32/ Description: pthreads for windows Supports: !(uwp|arm|arm64)
\ No newline at end of file diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 3abb2d591..a1806f870 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -1,11 +1,9 @@ -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(NOT VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) return() endif() -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() +vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP platform nor ARM architectures" ON_TARGET "UWP" ON_ARCH "arm" ) set(PTHREADS4W_VERSION "3.0.0") @@ -92,9 +90,10 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) |