From 49961e151b2382bd9b136f1fa3c109261c7dc794 Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Thu, 27 Jul 2017 20:43:05 -0700 Subject: [PATCH] [dimcli] update --- ports/dimcli/CONTROL | 3 +-- ports/dimcli/portfile.cmake | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index c85457c89..295c1ecda 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,4 +1,3 @@ Source: dimcli -Version: 1.0.3 +Version: 2.0.0 Description: C++ command line parser toolkit - diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index 465e1699e..72097a5f5 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -1,28 +1,19 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -set(ver 1.0.3) include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dimcli-${ver}) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/gknowles/dimcli/archive/v${ver}.zip" - FILENAME "dimcli-${ver}.zip" - SHA512 5168aff22223cb85421fabd4ce82f3ec0bcab6551704484bc5b05be02ead23bd3d4a629c558a15f214e9d999eccc9c129649d066fdacfda3c839a40b48f8ec17 -) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gknowles/dimcli + REF v2.0.0 + SHA512 55ff29e3ddd6a96946f58e661231a1d2197f56a86c9260142f083589738aaa5e2f7721c754fa4a86b450a943c19367e1c4f82aec57e5b7ae7336f989e0194dec + HEAD_REF master +) set(staticCrt OFF) if(VCPKG_CRT_LINKAGE STREQUAL static) set(staticCrt ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} + OPTIONS -DLINK_STATIC_RUNTIME:BOOL=${staticCrt} ) vcpkg_install_cmake() @@ -31,7 +22,6 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dimcli" RENAME copyright) -