From 857f76b6b9f39c383c43b6b018882149d1d27b3a Mon Sep 17 00:00:00 2001 From: sdcb Date: Wed, 16 Nov 2016 17:40:45 +0800 Subject: [PATCH] [poco] Remove useless depends, Add 7zip, drop POCO_MT. --- ports/poco/CONTROL | 2 +- ports/poco/portfile.cmake | 42 ++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index ee43ac2d38..71e55eb6c8 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,4 +1,4 @@ Source: poco Version: 1.7.6 -Build-Depends: openssl, libmariadb +Build-Depends: Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. \ No newline at end of file diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index e32126f609..cb5b7f1391 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/poco-1.7.6-all) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/poco-poco-1.7.6-release) vcpkg_download_distfile(ARCHIVE - URLS "https://pocoproject.org/releases/poco-1.7.6/poco-1.7.6-all.zip" - FILENAME "poco-1.7.6-all.zip" - SHA512 ed15c6ab69157d3caf3f5fcd861396ddbe3a98c1f3d513c2670e81601c176fb17549791836bd50014d9fb58aa3983e262312848f197e9c487af962cc27556df5 + URLS "https://github.com/pocoproject/poco/archive/poco-1.7.6-release.tar.gz" + FILENAME "poco-poco-1.7.6-release.tar.gz" + SHA512 a02b7ff66acf080942517b3b8644d6e5c7136c5edc6e58fd13083a74b97b5619253fc9db7863284a565226f95410ad4da1fa9738d14885f560aeb03c1f7c18aa ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -16,18 +16,14 @@ vcpkg_apply_patches( if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(POCO_STATIC ON) - set(POCO_MT ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPOCO_STATIC=${POCO_STATIC} - -DPOCO_MT=${POCO_MT} - - -DFORCE_OPENSSL=ON + -DENABLE_SEVENZIP=ON -DENABLE_TESTS=OFF - -DENABLE_MSVC_MP=ON -DPOCO_UNBUNDLED=OFF # OFF means: using internal copy of sqlite, libz, pcre, expat, ... ) @@ -41,22 +37,22 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +else() + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb + ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb + ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe + ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb + ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe + ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb) + + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/vcruntime140.dll + ${CURRENT_PACKAGES_DIR}/bin/msvcp140.dll + ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140.dll + ${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140.dll) endif() -file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/cpspc.pdb - ${CURRENT_PACKAGES_DIR}/bin/f2cpsp.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/cpspc.pdb - ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/f2cpsp.pdb) - -file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/vcruntime140.dll - ${CURRENT_PACKAGES_DIR}/bin/msvcp140.dll - ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140.dll - ${CURRENT_PACKAGES_DIR}/debug/bin/msvcp140.dll) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)