From ec11757f90621e9542cb9297f9df0a8841cbd3df Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 28 Mar 2020 10:15:32 +0800 Subject: [PATCH] [blitz] Update to the latest commit and fix no dll and lib generated (#10546) * [blitz] Update to the latest commit and fix no dll and lib generated * Update to the latest commit --- ports/blitz/CONTROL | 5 +++-- ports/blitz/portfile.cmake | 14 +++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/blitz/CONTROL b/ports/blitz/CONTROL index 21057b38cab..2df45ecfe45 100644 --- a/ports/blitz/CONTROL +++ b/ports/blitz/CONTROL @@ -1,4 +1,5 @@ Source: blitz -Version: 2019-09-26 +Version: 2020-03-25 Homepage: https://github.com/blitzpp/blitz -Description: Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing. \ No newline at end of file +Description: Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing. +Supports: !(arm|arm64|uwp) \ No newline at end of file diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake index 24002fce5c3..7e90f2a6456 100644 --- a/ports/blitz/portfile.cmake +++ b/ports/blitz/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blitzpp/blitz - REF 0e373f7c3478b10bd8ad8d699a291c57d9cb1e72 - SHA512 9ea0ba652b93fb3b159340b25bdef10c05662b2da23a3bd2e29ddd12d394b96513c0e5d9f348c0cc8fc767890f52d122a1b0fb8ac6adb77f1a8b4bc2beeac5d7 + REF 839fc5e0f35b1c38a01cfd7a94e83de81e8a6b55 + SHA512 efb6b19691e23c95cf6abd59607bce299b0c02a12ce6be105a35ad8509ab564b8dac8d6363f048e547d199e117d2bdd0e4ef3046d3c411f669c0a453a0b75627 HEAD_REF master ) @@ -14,13 +14,21 @@ vcpkg_add_to_path(${PYTHON2_DIR}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + PREFER_NINJA + -DBUILD_DOC=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +vcpkg_copy_pdbs() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # Handle copyright