From 75bd2efe0dce862dfa025209b8cecc61a00a1852 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 13 Oct 2020 13:17:32 -0700 Subject: [many ports] 2019.09.14 Updates (#13536) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [many ports] 2019.09.14 Updates * Revert failure ports * Revert failure ports * Revert failure ports * [urdfdom] Fix find dependency console_bridge * Revert failure ports * [devil] Compatible with jasper 2.0.20 * [devil] Refix compatible with jasper functions declaration on different os * Update ports/alembic/CONTROL Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Revert failure ports wangle * [azure-kinect-sensor-sdk] Fix build with matroska 1.6.2 * Revert failure ports * Revert failure ports * [urdfdom-headers] Fix include path in config.cmake file * upload patch * [urdfdom-headers] Refix include path in config.cmake file * [qt5-imageformats] Fix missing include math.h * [urdfdom-headers] Refix include path in config.cmake file * [qt5] Fix adding option PATCHES and other options when using qt_submodule_installation * Remove updated ports version * Commit suggestions * [libideviceactivation] revert Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/ecsutil/CONTROL | 12 +++--- ports/ecsutil/portfile.cmake | 94 ++++++++++++++++++++++---------------------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to 'ports/ecsutil') diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 92ab86e44..e406ed457 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,6 +1,6 @@ -Source: ecsutil -Version: 1.0.7.10 -Homepage: https://github.com/EMCECS/ecs-object-client-windows-cpp -Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. -Build-Depends: atlmfc (windows) -Supports: windows&(x64|x86) +Source: ecsutil +Version: 1.0.7.15 +Homepage: https://github.com/EMCECS/ecs-object-client-windows-cpp +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. +Build-Depends: atlmfc (windows) +Supports: windows&(x64|x86) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 5e41ad2cd..5cbf085bf 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,47 +1,47 @@ - -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP" "Linux" "OSX") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) -endif() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(ECSUtil_CONFIGURATION_RELEASE Release) - set(ECSUtil_CONFIGURATION_DEBUG Debug) -else() - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") - else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") - endif() -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO EMCECS/ecs-object-client-windows-cpp - REF v1.0.7.10 - SHA512 a13f39342c2468f18262968c531fa11932f0e7b1a75a11866efe9e4eabdc7ba45d638b0104da24dfab3efb61758ca50f7ecf01b2ea15c2cf39fba5c913b7784b - HEAD_REF master -) - -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH ECSUtil.sln - PLATFORM ${PLATFORM} - LICENSE_SUBPATH license.txt - TARGET ECSUtil - RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() + +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP" "Linux" "OSX") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM x86) +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EMCECS/ecs-object-client-windows-cpp + REF af9fd3cc0be5eacfeb431ca4607d3b73dd318353 # v1.0.7.15 + SHA512 091f4b4870d5bdcbd46c35b2d75e927c9da69e2aba9a24b36504ab9fa3e33fba6eec2a8a5b649fc3ad793e3043c3f2702b753341f74d87de1a7f96c251839c69 + HEAD_REF master +) + +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ECSUtil.sln + PLATFORM ${PLATFORM} + LICENSE_SUBPATH license.txt + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() -- cgit v1.2.3