mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 00:49:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[coroutine] arch, commit (#5787)

Browse Source 
* version: 1.4.1
* check architecture before vcpkg_from_github

x86 error message contains repository path to prevent confusing

Signed-off-by: luncliff <luncliff@gmail.com>
This commit is contained in:
Park DongHa 2019-03-25 07:32:53 +09:00 committed by Victor Romero
parent 5d875afa94
commit b6a08c15af
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/coroutine/CONTROL
View File

@ -1,4 +1,4 @@
Source: coroutine
Version: 1.4.0-1
Version: 1.4.1
Build-Depends: ms-gsl
Description: C++ coroutine helper/example library

23
ports/coroutine/portfile.cmake
View File

@ -1,23 +1,23 @@
include(vcpkg_common_functions)
# The tagged commit for release 1.4 was changed by the library's author.
# The current commit for release 1.4 is 3f804ca0f9ec94e3c85e3c5cc00aecc577fb8aad
# We use the commit's hash to avoid the tag changing again it in the future.
set(VERSION_1_4_COMMIT 3f804ca0f9ec94e3c85e3c5cc00aecc577fb8aad)
if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead. If it is critical, create an issue at the repo: github.com/luncliff/coroutine")
endif()
# changed to 1.4.1
set(VERSION_1_4_COMMIT 8399236a4adf1cb49ef51133fb887027e3d77141)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO luncliff/coroutine
REF ${VERSION_1_4_COMMIT}
SHA512 a77d66a8d485a99278f15652d26f255653824c47bd3653233e89ddb6368bc3b45ab0a8049e504c5acc8cf051da582bf6b4d8461c8f7f57bf5a0b7dcaddc0afbb
SHA512 35adf0aa3a923b869e02d1e33987f6c9922f90918e84feaf5a41e46334b7555db75f55c6dd797f74112010ef5e682ee6f5fbf58be84af88a8f8f084f3d6dac05
HEAD_REF master
)
if(${VCPKG_TARGET_ARCHITECTURE} MATCHES x86)
message(FATAL_ERROR "This library doesn't support x86 arch. Please use x64 instead or contact maintainer")
endif()
# package: 'ms-gsl'
message(STATUS "Using Guideline Support Library at ${CURRENT_INSTALLED_DIR}/include")
set(GSL_INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include
CACHE PATH "path to include C++ core guideline support library" FORCE)
message(STATUS "Using ms-gsl at ${GSL_INCLUDE_DIR}")
set(DLL_LINKAGE false)
if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
@ -29,8 +29,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
# package: 'ms-gsl'
-DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DGSL_INCLUDE_DIR=${GSL_INCLUDE_DIR}
-DTEST_DISABLED=True
-DBUILD_SHARED_LIBS=${DLL_LINKAGE}
)