diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 02:30:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 02:30:59 -0700 |
| commit | 0e000644053015b7f7a0985e14f0bd384c847d17 (patch) | |
| tree | 7e456fd12b3bf281b28587338f1650017c8b32ab /ports/coroutine | |
| parent | 93ce6b4f27602cd18f4327c2cfd84093d472b8bb (diff) | |
| parent | 39ba5b2b30c9f7b49e777a62093cdd49d05b53a9 (diff) | |
| download | vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.tar.gz vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.zip | |
Merge branch 'master' into master
Diffstat (limited to 'ports/coroutine')
| -rw-r--r-- | ports/coroutine/CONTROL | 2 | ||||
| -rw-r--r-- | ports/coroutine/portfile.cmake | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL index 4b193d5bd..2afe8ae17 100644 --- a/ports/coroutine/CONTROL +++ b/ports/coroutine/CONTROL @@ -1,4 +1,4 @@ Source: coroutine -Version: 1.4.0 +Version: 1.4.1 Build-Depends: ms-gsl Description: C++ coroutine helper/example library diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index 17e7596af..56b7535d6 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -1,19 +1,23 @@ include(vcpkg_common_functions) +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 1.4 - SHA512 981c9c728c7888995880a97e8533fa31f41085ef57e1c61e53e555f329d20d4a882d9de724d9e93e3d009dc3fe0669fe4d1af403654a9373e4aab44c933628a3 + REF ${VERSION_1_4_COMMIT} + 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) @@ -25,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} ) |