From 19690cfeb05b002b464b385040965b7951f5b566 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:36:23 +0800 Subject: [PATCH 01/14] [many ports]switch to vcpkg-cmake / vckg-cmake-config --- ports/absent/portfile.cmake | 17 ++++++------- ports/absent/vcpkg.json | 14 +++++++++-- ports/ade/portfile.cmake | 15 ++++++------ ports/ade/vcpkg.json | 14 +++++++++-- ports/alac-decoder/portfile.cmake | 17 ++++++------- ports/alac-decoder/vcpkg.json | 14 +++++++++-- ports/alac/portfile.cmake | 17 +++++++------ ports/alac/vcpkg.json | 12 ++++++++- ports/aliyun-oss-c-sdk/portfile.cmake | 12 ++++----- ports/aliyun-oss-c-sdk/vcpkg.json | 12 +++++++-- ports/ampl-mp/portfile.cmake | 19 +++++++-------- ports/ampl-mp/vcpkg.json | 10 +++++++- ports/anyrpc/portfile.cmake | 5 ++-- ports/anyrpc/vcpkg.json | 14 +++++++++-- ports/argagg/portfile.cmake | 11 ++++----- ports/argagg/vcpkg.json | 14 +++++++++-- ports/argumentum/portfile.cmake | 15 ++++++------ ports/argumentum/vcpkg.json | 14 +++++++++-- ports/azure-storage-cpp/portfile.cmake | 17 ++++++------- ports/azure-storage-cpp/vcpkg.json | 10 +++++++- ports/behaviortree-cpp/portfile.cmake | 13 +++++----- ports/behaviortree-cpp/vcpkg.json | 12 +++++++-- ports/berkeleydb/portfile.cmake | 13 +++++----- ports/berkeleydb/vcpkg.json | 14 +++++++++-- ports/bigint/portfile.cmake | 15 ++++++------ ports/bigint/vcpkg.json | 14 +++++++++-- ports/binn/portfile.cmake | 14 +++++------ ports/binn/vcpkg.json | 14 +++++++++-- ports/blas/portfile.cmake | 2 +- ports/blas/vcpkg.json | 12 +++++++-- ports/box2d/portfile.cmake | 7 +++--- ports/butteraugli/portfile.cmake | 17 +++++++------ ports/butteraugli/vcpkg.json | 12 +++++++-- ports/cctz/portfile.cmake | 13 +++++----- ports/cctz/vcpkg.json | 12 +++++++-- ports/cello/portfile.cmake | 15 ++++++------ ports/cello/vcpkg.json | 14 +++++++++-- ports/cfitsio/portfile.cmake | 23 +++++++++--------- ports/cfitsio/vcpkg.json | 10 +++++++- ports/cgicc/portfile.cmake | 17 ++++++------- ports/cgicc/vcpkg.json | 14 +++++++++-- ports/chipmunk/portfile.cmake | 17 ++++++------- ports/chipmunk/vcpkg.json | 14 +++++++++-- ports/chromaprint/portfile.cmake | 9 +++---- ports/chromaprint/vcpkg.json | 12 +++++++-- ports/clamav/portfile.cmake | 9 +++---- ports/clamav/vcpkg.json | 10 +++++++- ports/clapack/portfile.cmake | 17 ++++++------- ports/clapack/vcpkg.json | 12 +++++++-- ports/cmcstl2/portfile.cmake | 13 +++++----- ports/cmcstl2/vcpkg.json | 14 +++++++++-- ports/cmocka/portfile.cmake | 11 ++++----- ports/cnl/portfile.cmake | 13 +++++----- ports/cnl/vcpkg.json | 14 +++++++++-- ports/coin/portfile.cmake | 19 +++++++-------- ports/coin/vcpkg.json | 12 +++++++-- ports/concurrentqueue/portfile.cmake | 23 +++++++++--------- ports/concurrentqueue/vcpkg.json | 13 +++++++++- ports/constexpr-contracts/portfile.cmake | 15 ++++++------ ports/constexpr-contracts/vcpkg.json | 14 +++++++++-- ports/coroutine/portfile.cmake | 17 ++++++------- ports/coroutine/vcpkg.json | 12 +++++++-- ports/corrade/portfile.cmake | 5 ++-- ports/corrade/vcpkg.json | 10 +++++++- ports/cpp-netlib/portfile.cmake | 15 ++++++------ ports/cpp-netlib/vcpkg.json | 12 +++++++-- ports/cppcodec/portfile.cmake | 15 ++++++------ ports/cppcodec/vcpkg.json | 14 +++++++++-- ports/cppitertools/portfile.cmake | 15 ++++++------ ports/cppitertools/vcpkg.json | 12 +++++++-- ports/cppkafka/portfile.cmake | 11 ++++----- ports/cppkafka/vcpkg.json | 12 +++++++-- ports/cppmicroservices/portfile.cmake | 7 +++--- ports/cppmicroservices/vcpkg.json | 11 ++++++++- ports/ctbignum/portfile.cmake | 16 ++++++------ ports/ctbignum/vcpkg.json | 12 +++++++-- ports/ctemplate/portfile.cmake | 13 +++++----- ports/ctemplate/vcpkg.json | 14 +++++++++-- ports/darts-clone/portfile.cmake | 13 +++++----- ports/darts-clone/vcpkg.json | 14 +++++++++-- ports/dbow2/portfile.cmake | 17 ++++++------- ports/dbow2/vcpkg.json | 12 +++++++-- ports/debug-assert/portfile.cmake | 13 +++++----- ports/debug-assert/vcpkg.json | 13 +++++++++- ports/devil/portfile.cmake | 13 +++++----- ports/devil/vcpkg.json | 12 ++++++++- ports/discord-game-sdk/portfile.cmake | 13 +++++----- ports/discord-game-sdk/vcpkg.json | 14 +++++++++-- ports/discord-rpc/portfile.cmake | 13 +++++----- ports/discord-rpc/vcpkg.json | 12 +++++++-- ports/discount/portfile.cmake | 7 +++--- ports/discount/vcpkg.json | 14 +++++++++-- ports/discreture/portfile.cmake | 14 +++++------ ports/discreture/vcpkg.json | 12 +++++++-- ports/docopt/portfile.cmake | 23 +++++++++--------- ports/docopt/vcpkg.json | 14 +++++++++-- ports/duktape/portfile.cmake | 31 ++++++++++++------------ ports/duktape/vcpkg.json | 14 +++++++++-- ports/eabase/portfile.cmake | 15 ++++++------ ports/eabase/vcpkg.json | 14 +++++++++-- 100 files changed, 874 insertions(+), 477 deletions(-) diff --git a/ports/absent/portfile.cmake b/ports/absent/portfile.cmake index 1c8436aa8b7915..d0a4eb31bb4e15 100644 --- a/ports/absent/portfile.cmake +++ b/ports/absent/portfile.cmake @@ -5,29 +5,28 @@ vcpkg_from_github( SHA512 c7b7d29422ef8afc48e3093496e1dd055cfe9969ae037c2b06ea70fe4283e7a7e9129171efaa257e909c535e24df5861b992b24b00ec03f965730e6a22e13015 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/${PORT} ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) file(INSTALL - ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/absent/vcpkg.json b/ports/absent/vcpkg.json index 3f6ae21dcdd89d..3623acc8cd0e44 100644 --- a/ports/absent/vcpkg.json +++ b/ports/absent/vcpkg.json @@ -1,7 +1,17 @@ { "name": "absent", "version-string": "0.3.1", - "port-version": 1, + "port-version": 2, "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way", - "homepage": "https://github.com/rvarago/absent" + "homepage": "https://github.com/rvarago/absent", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index 7af58d539a71e6..fd99ae728a4b69 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -6,19 +6,18 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ade RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ade/vcpkg.json b/ports/ade/vcpkg.json index 53fb3606d73169..946cdc994fe570 100644 --- a/ports/ade/vcpkg.json +++ b/ports/ade/vcpkg.json @@ -1,6 +1,16 @@ { "name": "ade", "version-string": "0.1.1f", - "port-version": 2, - "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution." + "port-version": 3, + "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake index 15c8152b35371f..86d41c1f3fbb15 100644 --- a/ports/alac-decoder/portfile.cmake +++ b/ports/alac-decoder/portfile.cmake @@ -8,25 +8,24 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES remove_stdint_headers.patch no-pragma-warning.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/decomp.c" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/alac-decoder/vcpkg.json b/ports/alac-decoder/vcpkg.json index b844541009bfca..4755cc81f9ab9a 100644 --- a/ports/alac-decoder/vcpkg.json +++ b/ports/alac-decoder/vcpkg.json @@ -1,7 +1,17 @@ { "name": "alac-decoder", "version-string": "0.2", - "port-version": 5, + "port-version": 6, "description": "ALAC C implementation of a decoder, written from reverse engineering the file format", - "homepage": "https://distfiles.macports.org/alac_decoder" + "homepage": "https://distfiles.macports.org/alac_decoder", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/alac/portfile.cmake b/ports/alac/portfile.cmake index d9dd83141e7dc4..427e75425be997 100644 --- a/ports/alac/portfile.cmake +++ b/ports/alac/portfile.cmake @@ -12,15 +12,16 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac RENAME copyright) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/alac" RENAME copyright) diff --git a/ports/alac/vcpkg.json b/ports/alac/vcpkg.json index 74adbe459d0d26..c7fc36afd7389f 100644 --- a/ports/alac/vcpkg.json +++ b/ports/alac/vcpkg.json @@ -4,5 +4,15 @@ "port-version": 2, "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.", "homepage": "https://github.com/macosforge/alac", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/aliyun-oss-c-sdk/portfile.cmake b/ports/aliyun-oss-c-sdk/portfile.cmake index 6b3af2ab1fabeb..cdbad6aefc382c 100644 --- a/ports/aliyun-oss-c-sdk/portfile.cmake +++ b/ports/aliyun-oss-c-sdk/portfile.cmake @@ -12,13 +12,11 @@ vcpkg_from_github( patch.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(REMOVE_RECURSE "{CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aliyun-oss-c-sdk/vcpkg.json b/ports/aliyun-oss-c-sdk/vcpkg.json index 3494e59994412a..d8c37f5a3fe954 100644 --- a/ports/aliyun-oss-c-sdk/vcpkg.json +++ b/ports/aliyun-oss-c-sdk/vcpkg.json @@ -1,11 +1,19 @@ { "name": "aliyun-oss-c-sdk", "version-string": "3.10.0", - "port-version": 1, + "port-version": 2, "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.", "supports": "!(uwp | linux | osx)", "dependencies": [ "apr-util", - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake index 701298a2ff643b..c7d6f3b47bf825 100644 --- a/ports/ampl-mp/portfile.cmake +++ b/ports/ampl-mp/portfile.cmake @@ -21,9 +21,8 @@ if (NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD=no -DBUILD_TESTING=OFF @@ -31,20 +30,20 @@ vcpkg_configure_cmake( -DARITHCHK_EXEC=${ARITHCHK_EXEC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES gen-expr-info AUTO_CLEAN) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-mp TARGET_PATH share/unofficial-mp) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mp) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" # remove amplsig.dll and cp.dll, see https://github.com/ampl/mp/issues/130 - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" ) -configure_file(${SOURCE_PATH}/LICENSE.rst ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.rst" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json index 287cd3cb374201..6884d62751d797 100644 --- a/ports/ampl-mp/vcpkg.json +++ b/ports/ampl-mp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ampl-mp", "version-date": "2020-11-11", - "port-version": 3, + "port-version": 4, "description": "An open-source library for mathematical programming", "homepage": "https://github.com/ampl/mp", "supports": "!uwp", @@ -10,6 +10,14 @@ { "name": "ampl-mp", "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake index 666fa016639263..73e58ce92e0075 100644 --- a/ports/anyrpc/portfile.cmake +++ b/ports/anyrpc/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF @@ -22,7 +21,7 @@ vcpkg_configure_cmake( -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json index a9bc22ada64c53..9db74646cf3afc 100644 --- a/ports/anyrpc/vcpkg.json +++ b/ports/anyrpc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "anyrpc", "version-date": "2021-08-24", - "port-version": 1, + "port-version": 2, "description": "A multiprotocol remote procedure call system for C++.", - "homepage": "https://github.com/sgieseking/anyrpc" + "homepage": "https://github.com/sgieseking/anyrpc", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake index 54d32171adac65..70e162b12f3b7f 100644 --- a/ports/argagg/portfile.cmake +++ b/ports/argagg/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGAGG_BUILD_EXAMPLES=OFF -DARGAGG_BUILD_TESTS=OFF -DARGAGG_BUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/argagg/vcpkg.json b/ports/argagg/vcpkg.json index 73dc92e5d6d58c..ad43aa2ea7dfed 100644 --- a/ports/argagg/vcpkg.json +++ b/ports/argagg/vcpkg.json @@ -1,6 +1,16 @@ { "name": "argagg", "version-string": "0.4.6", - "port-version": 1, - "description": "A simple C++11 command line argument parser" + "port-version": 2, + "description": "A simple C++11 command line argument parser", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/argumentum/portfile.cmake b/ports/argumentum/portfile.cmake index 52d7d1c7420ae7..c96433e13e87ea 100755 --- a/ports/argumentum/portfile.cmake +++ b/ports/argumentum/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGUMENTUM_BUILD_EXAMPLES=OFF -DARGUMENTUM_BUILD_TESTS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Argumentum) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Argumentum) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/argumentum/vcpkg.json b/ports/argumentum/vcpkg.json index 282dbf6d3affc0..f077df3a683787 100644 --- a/ports/argumentum/vcpkg.json +++ b/ports/argumentum/vcpkg.json @@ -1,7 +1,17 @@ { "name": "argumentum", "version-string": "0.3.1", - "port-version": 1, + "port-version": 2, "description": "A C++17 command line argument parser inspired by Python argparse", - "homepage": "https://github.com/mmahnic/argumentum" + "homepage": "https://github.com/mmahnic/argumentum", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index b4bad8eee3a4f1..ba9154d86b2307 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -8,25 +8,24 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage" OPTIONS -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF OPTIONS_RELEASE - -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/lib + "-DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/lib" OPTIONS_DEBUG - -DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib + "-DGETTEXT_LIB_DIR=${CURRENT_INSTALLED_DIR}/debug/lib" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL - ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include) + "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json index 53dc1752c960d8..c8c6825b3cf7cb 100644 --- a/ports/azure-storage-cpp/vcpkg.json +++ b/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", "version-string": "7.5.0", - "port-version": 3, + "port-version": 4, "description": [ "[legacy] Microsoft Azure Storage Client SDK for C++", "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." @@ -36,6 +36,14 @@ { "name": "libxml2", "platform": "!windows & !uwp" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 79feac53adf6f3..7d0bbe68f8cce0 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES 001_port_fixes.patch 002_fix_dependencies.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1 -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1 @@ -25,11 +24,11 @@ vcpkg_configure_cmake( -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/BehaviorTreeV3/cmake TARGET_PATH share/behaviortreev3) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/BehaviorTreeV3/cmake PACKAGE_NAME behaviortreev3) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 835160cc34d19f..d99f0e5215fab6 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,12 +1,20 @@ { "name": "behaviortree-cpp", "version": "3.5.6", - "port-version": 2, + "port-version": 3, "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", "supports": "!uwp", "dependencies": [ "boost-coroutine2", - "cppzmq" + "cppzmq", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake index 5d3495496683de..33e67243a5e5fa 100644 --- a/ports/berkeleydb/portfile.cmake +++ b/ports/berkeleydb/portfile.cmake @@ -6,18 +6,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES fix-conflict-macro.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/berkeleydb/vcpkg.json b/ports/berkeleydb/vcpkg.json index d9436faa637f0c..bf9fe13642c6ff 100644 --- a/ports/berkeleydb/vcpkg.json +++ b/ports/berkeleydb/vcpkg.json @@ -1,8 +1,18 @@ { "name": "berkeleydb", "version": "4.8.30", - "port-version": 8, + "port-version": 9, "description": "BDB - A high-performance embedded database for key/value data.", "homepage": "https://download.oracle.com/", - "supports": "!(uwp | linux | osx)" + "supports": "!(uwp | linux | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake index 7231697501a63d..6c7e706094c022 100644 --- a/ports/bigint/portfile.cmake +++ b/ports/bigint/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES fix-osx-usage.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_config_cmake_fixup() -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bigint/vcpkg.json b/ports/bigint/vcpkg.json index 6a70944a6a0d1d..c8d27e6568688d 100644 --- a/ports/bigint/vcpkg.json +++ b/ports/bigint/vcpkg.json @@ -1,7 +1,17 @@ { "name": "bigint", "version-string": "2010.04.30", - "port-version": 7, + "port-version": 8, "description": "C++ Big Integer Library", - "homepage": "https://mattmccutchen.net/bigint" + "homepage": "https://mattmccutchen.net/bigint", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/binn/portfile.cmake b/ports/binn/portfile.cmake index 1ce3a8cd51d2cd..ebe87e01445854 100644 --- a/ports/binn/portfile.cmake +++ b/ports/binn/portfile.cmake @@ -10,17 +10,15 @@ vcpkg_from_github( 0001_fix_uwp.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(INSTALL ${SOURCE_PATH}/src/binn.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/binn) +file(INSTALL "${SOURCE_PATH}/src/binn.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/binn") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/binn) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/binn/LICENSE ${CURRENT_PACKAGES_DIR}/share/binn/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/binn/vcpkg.json b/ports/binn/vcpkg.json index 09fc20cb203e7d..edf21b9baf36e6 100644 --- a/ports/binn/vcpkg.json +++ b/ports/binn/vcpkg.json @@ -1,6 +1,16 @@ { "name": "binn", "version-string": "3.0", - "port-version": 1, - "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use." + "port-version": 2, + "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/blas/portfile.cmake b/ports/blas/portfile.cmake index f70aa46eabd3fb..314df6ed0791cb 100644 --- a/ports/blas/portfile.cmake +++ b/ports/blas/portfile.cmake @@ -1,5 +1,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure BLAS can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json index aca4cf894e418c..611cbdc7a325c8 100644 --- a/ports/blas/vcpkg.json +++ b/ports/blas/vcpkg.json @@ -1,9 +1,17 @@ { "name": "blas", "version-string": "1", - "port-version": 1, + "port-version": 2, "description": "Metapackage for packages which provide BLAS", "dependencies": [ - "openblas" + "openblas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index e209c85a3cd544..c8e5c7f82f9ac2 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBOX2D_BUILD_UNIT_TESTS=OFF -DBOX2D_BUILD_TESTBED=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/box2d) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/box2d) vcpkg_copy_pdbs() diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake index 26ff21e4282de3..d74f7b4024cb0c 100644 --- a/ports/butteraugli/portfile.cmake +++ b/ports/butteraugli/portfile.cmake @@ -10,17 +10,18 @@ vcpkg_from_github( missing_header.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/butteraugli/vcpkg.json b/ports/butteraugli/vcpkg.json index d11da192d644c3..d4df1d2de63d6b 100644 --- a/ports/butteraugli/vcpkg.json +++ b/ports/butteraugli/vcpkg.json @@ -1,11 +1,19 @@ { "name": "butteraugli", "version-string": "2019-05-08", - "port-version": 2, + "port-version": 3, "description": "butteraugli estimates the psychovisual difference between two images", "homepage": "https://github.com/google/butteraugli", "dependencies": [ "libjpeg-turbo", - "libpng" + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index 195af4fe6c1765..a5ce309f4e84ea 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -12,17 +12,16 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz TARGET_PATH share/unofficial-cctz) +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-cctz) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json index aaf937dfb04e78..67e2ffb2cd8bea 100644 --- a/ports/cctz/vcpkg.json +++ b/ports/cctz/vcpkg.json @@ -1,10 +1,18 @@ { "name": "cctz", "version-string": "2.3", - "port-version": 3, + "port-version": 4, "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", "homepage": "https://github.com/google/cctz", "dependencies": [ - "benchmark" + "benchmark", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cello/portfile.cmake b/ports/cello/portfile.cmake index 279d5c4a86c35a..9718c714ee0487 100644 --- a/ports/cello/portfile.cmake +++ b/ports/cello/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("{SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json index 67e817b41a0c16..f7f271eedfba89 100644 --- a/ports/cello/vcpkg.json +++ b/ports/cello/vcpkg.json @@ -1,7 +1,17 @@ { "name": "cello", "version-date": "2019-07-23", - "port-version": 2, + "port-version": 3, "description": "Higher level programming in C", - "homepage": "https://libcello.org/" + "homepage": "https://libcello.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index e75a109454c609..b447f90eae9cb0 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES 0001-fix-dependencies.patch 0002-export-cmake-targets.patch @@ -36,9 +36,8 @@ if ("pthreads" IN_LIST FEATURES) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DUSE_PTHREADS=${WITH_PTHREADS} @@ -46,12 +45,12 @@ vcpkg_configure_cmake( -DPKG_CONFIG_LIBS=-lcfitsio ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cfitsio TARGET_PATH share/unofficial-cfitsio) +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-cfitsio) -file(READ ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake ASSIMP_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake " +file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake" ASSIMP_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake" " include(CMakeFindDependencyMacro) ${FIND_CURL_DEPENDENCY} ${FIND_PTHREADS_DEPENDENCY} @@ -59,15 +58,15 @@ find_dependency(ZLIB) ${ASSIMP_CONFIG} ") -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake" "cmake_policy(VERSION 2.6)" "cmake_policy(VERSION 2.6)\r\n\ # Required for the evaluation of \"if(@BUILD_SHARED_LIBS@)\" below to function\r\n\ cmake_policy(SET CMP0012 NEW)\r\n" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/unistd.h ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include/unistd.h" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/FindPthreads.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio) +file(INSTALL "${SOURCE_PATH}/FindPthreads.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio") -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json index 9ecf0be86ed143..7c47f6b3733669 100644 --- a/ports/cfitsio/vcpkg.json +++ b/ports/cfitsio/vcpkg.json @@ -1,10 +1,18 @@ { "name": "cfitsio", "version": "3.49", - "port-version": 2, + "port-version": 3, "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake index 0be8d18258a31d..69176f3d47015a 100644 --- a/ports/cgicc/portfile.cmake +++ b/ports/cgicc/portfile.cmake @@ -9,33 +9,32 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-define.patch fix-static-build.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h CGI_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h" CGI_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) string(REPLACE "# ifdef CGICC_STATIC" "# if 0" CGI_H "${CGI_H}") else() string(REPLACE "# ifdef CGICC_STATIC" "# if 1" CGI_H "${CGI_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h "${CGI_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h" "${CGI_H}") -file(INSTALL ${SOURCE_PATH}/COPYING.DOC DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.DOC" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cgicc/vcpkg.json b/ports/cgicc/vcpkg.json index 5d3b9b146aa632..57ff62c6029dc9 100644 --- a/ports/cgicc/vcpkg.json +++ b/ports/cgicc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "cgicc", "version-string": "3.2.19", - "port-version": 5, + "port-version": 6, "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web", - "homepage": "https://www.gnu.org/software/cgicc/" + "homepage": "https://www.gnu.org/software/cgicc/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake index f0f72cd6cb1425..3cd705c308370e 100644 --- a/ports/chipmunk/portfile.cmake +++ b/ports/chipmunk/portfile.cmake @@ -9,9 +9,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DEMOS=OFF -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED} @@ -19,21 +18,21 @@ vcpkg_configure_cmake( -DINSTALL_STATIC=${KEYSTONE_BUILD_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() -file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE ${DLLS}) endif() file(INSTALL - ${SOURCE_PATH}/include/chipmunk - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${SOURCE_PATH}/include/chipmunk" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/chipmunk/vcpkg.json b/ports/chipmunk/vcpkg.json index 07bda6fcb914a8..24e922777e3aad 100644 --- a/ports/chipmunk/vcpkg.json +++ b/ports/chipmunk/vcpkg.json @@ -1,7 +1,17 @@ { "name": "chipmunk", "version-string": "7.0.3", - "port-version": 2, + "port-version": 3, "description": "A fast and lightweight 2D game physics library.", - "homepage": "https://github.com/slembcke/Chipmunk2D" + "homepage": "https://github.com/slembcke/Chipmunk2D", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/chromaprint/portfile.cmake b/ports/chromaprint/portfile.cmake index 286edaeb38ae4c..afdcba5886304f 100644 --- a/ports/chromaprint/portfile.cmake +++ b/ports/chromaprint/portfile.cmake @@ -7,12 +7,11 @@ vcpkg_from_github( fix_lrintf_detection.patch # submitted upstream as https://github.com/acoustid/chromaprint/pull/85 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/chromaprint/vcpkg.json b/ports/chromaprint/vcpkg.json index 271532380431c5..5aee10bf190596 100644 --- a/ports/chromaprint/vcpkg.json +++ b/ports/chromaprint/vcpkg.json @@ -1,11 +1,19 @@ { "name": "chromaprint", "version": "1.5.0", - "port-version": 1, + "port-version": 2, "description": "C library for generating audio fingerprints used by AcoustID", "homepage": "https://github.com/acoustid/chromaprint", "license": "LGPL-2.1-or-later", "dependencies": [ - "ffmpeg" + "ffmpeg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/clamav/portfile.cmake b/ports/clamav/portfile.cmake index 3697306a1fb5cf..1b388479bd23b9 100644 --- a/ports/clamav/portfile.cmake +++ b/ports/clamav/portfile.cmake @@ -14,9 +14,8 @@ vcpkg_from_github( "mspack.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIBCLAMAV_ONLY=ON -DENABLE_DOCS=OFF @@ -25,10 +24,10 @@ vcpkg_configure_cmake( -DENABLE_EXTERNAL_MSPACK=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/clamav/vcpkg.json b/ports/clamav/vcpkg.json index ca212c5768ad02..885db85d00f5c5 100644 --- a/ports/clamav/vcpkg.json +++ b/ports/clamav/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clamav", "version-semver": "0.103.0", - "port-version": 3, + "port-version": 4, "description": "ClamAV is an open-source anti-virus toolkit.", "homepage": "https://www.clamav.net", "supports": "!uwp & !static", @@ -13,6 +13,14 @@ "openssl", "pcre2", "pthreads", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index d84c864e207ee6..a5031fc63e8492 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -44,24 +44,23 @@ Continuing with trying to run arithchk anyway.") endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DEBUG_POSTFIX=d ${ARITH_PATH} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() #TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack) +vcpkg_config_cmake_fixup(CONFIG_PATH share/clapack) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install clapack wrappers. -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lapack") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 78b840f56495cd..b3d28c2965c9e3 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,10 +1,18 @@ { "name": "clapack", "version": "3.2.1", - "port-version": 20, + "port-version": 21, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ - "blas" + "blas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cmcstl2/portfile.cmake b/ports/cmcstl2/portfile.cmake index d1e7125a5e296e..2dbfb1fce5a0b7 100644 --- a/ports/cmcstl2/portfile.cmake +++ b/ports/cmcstl2/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSTL2_BUILD_EXAMPLES=OFF -DSTL2_BUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/cmcstl2/vcpkg.json b/ports/cmcstl2/vcpkg.json index df0d6a2a52add9..d3834a132d814e 100644 --- a/ports/cmcstl2/vcpkg.json +++ b/ports/cmcstl2/vcpkg.json @@ -1,7 +1,17 @@ { "name": "cmcstl2", "version-string": "2019-07-20", - "port-version": 1, + "port-version": 2, "description": "An implementation of C++ Extensions for Ranges", - "homepage": "https://github.com/CaseyCarter/cmcstl2" + "homepage": "https://github.com/CaseyCarter/cmcstl2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake index 53c9aee69890ae..5da366763379db 100644 --- a/ports/cmocka/portfile.cmake +++ b/ports/cmocka/portfile.cmake @@ -7,9 +7,8 @@ vcpkg_from_gitlab( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DWITH_CMOCKERY_SUPPORT=ON -DUNIT_TESTING=OFF @@ -17,14 +16,14 @@ vcpkg_configure_cmake( -DPICKY_DEVELOPER=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 13ba7327585ffb..6c19f14dd44119 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_github( disable-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/cnl/vcpkg.json b/ports/cnl/vcpkg.json index 930fcdeed6706b..cf5d794ac8b80f 100644 --- a/ports/cnl/vcpkg.json +++ b/ports/cnl/vcpkg.json @@ -1,7 +1,17 @@ { "name": "cnl", "version-string": "1.1.7", - "port-version": 1, + "port-version": 2, "description": "A Compositional Numeric Library for C++", - "homepage": "https://github.com/johnmcfarlane/cnl" + "homepage": "https://github.com/johnmcfarlane/cnl", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index 22f97663dc4f3b..fa9ed41fb7aa23 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -20,9 +20,8 @@ elseif(VCPKG_CRT_LINKAGE STREQUAL static) set(COIN_BUILD_MSVC_STATIC_RUNTIME ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCOIN_BUILD_DOCUMENTATION=OFF -DCOIN_BUILD_MSVC_STATIC_RUNTIME=${COIN_BUILD_MSVC_STATIC_RUNTIME} @@ -30,18 +29,18 @@ vcpkg_configure_cmake( -DCOIN_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Coin-4.0.0) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/Coin-4.0.0) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Coin/profiler") vcpkg_fixup_pkgconfig() diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index 02430c7651a32a..793206c54d8832 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", "version-string": "4.0.0", - "port-version": 5, + "port-version": 6, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", @@ -12,7 +12,15 @@ "boost-math", "boost-smart-ptr", "boost-static-assert", - "opengl-registry" + "opengl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "simage", diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index ed5c189f9c00c8..cdfc72b9f2db42 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -7,24 +7,23 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-concurrentqueue TARGET_PATH share/unofficial-concurrentqueue) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-concurrentqueue) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") configure_file( - ${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake" @ONLY ) -file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/concurrentqueue/vcpkg.json b/ports/concurrentqueue/vcpkg.json index f091937d608593..25b733d690e522 100644 --- a/ports/concurrentqueue/vcpkg.json +++ b/ports/concurrentqueue/vcpkg.json @@ -1,6 +1,17 @@ { "name": "concurrentqueue", "version": "1.0.3", + "port-version": 1, "description": "A fast multi-producer, multi-consumer lock-free concurrent queue for C++11", - "homepage": "https://github.com/cameron314/concurrentqueue" + "homepage": "https://github.com/cameron314/concurrentqueue", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/constexpr-contracts/portfile.cmake b/ports/constexpr-contracts/portfile.cmake index d189ba43d9e5a1..607fb5e5ce0be2 100644 --- a/ports/constexpr-contracts/portfile.cmake +++ b/ports/constexpr-contracts/portfile.cmake @@ -8,13 +8,12 @@ vcpkg_from_github( HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/constexpr-contracts) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/constexpr-contracts) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/constexpr-contracts/vcpkg.json b/ports/constexpr-contracts/vcpkg.json index 1e5da41352de0e..4533217c0ff805 100644 --- a/ports/constexpr-contracts/vcpkg.json +++ b/ports/constexpr-contracts/vcpkg.json @@ -1,7 +1,17 @@ { "name": "constexpr-contracts", "version-string": "2020-08-09", - "port-version": 1, + "port-version": 2, "description": "A constexpr-friendly, optimisation-friendly contracts library.", - "homepage": "https://github.com/cjdb/constexpr-contracts" + "homepage": "https://github.com/cjdb/constexpr-contracts", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index f01475086cf72a..896d053ed5d4d8 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -14,20 +14,19 @@ vcpkg_from_github( gsl-4_0_0.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + "-DGSL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" -DBUILD_TESTING=False ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_config_cmake_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/coroutine/vcpkg.json b/ports/coroutine/vcpkg.json index e1b0a5d77f1793..cdae32b492fef8 100644 --- a/ports/coroutine/vcpkg.json +++ b/ports/coroutine/vcpkg.json @@ -1,11 +1,19 @@ { "name": "coroutine", "version": "1.5.0", - "port-version": 4, + "port-version": 5, "description": "C++ 20 Coroutines helper/example library", "homepage": "https://github.com/luncliff/coroutine", "supports": "!uwp", "dependencies": [ - "ms-gsl" + "ms-gsl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 8dd02a9a6f2348..54502932dc6123 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -33,9 +33,8 @@ if(VCPKG_CROSSCOMPILING) ) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} "${corrade_rc_param}" @@ -45,7 +44,7 @@ vcpkg_configure_cmake( CORRADE_RC_EXECUTABLE ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Debug includes and share are the same as release file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index 17c71da34a5baf..baacdf279101e5 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 4, + "port-version": 5, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ @@ -12,6 +12,14 @@ "features": [ "utility" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake index 4674917b6220fc..85a58b46571512 100644 --- a/ports/cpp-netlib/portfile.cmake +++ b/ports/cpp-netlib/portfile.cmake @@ -12,22 +12,21 @@ vcpkg_from_github( PATCHES stream-handler-executor.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cppnetlib) + vcpkg_config_cmake_fixup(CONFIG_PATH cmake PACKAGE_NAME cppnetlib) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib TARGET_PATH share/cppnetlib) + vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/cppnetlib PACKAGE_NAME cppnetlib) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpp-netlib/vcpkg.json b/ports/cpp-netlib/vcpkg.json index 40f200d781c1a3..c6b65a738cb304 100644 --- a/ports/cpp-netlib/vcpkg.json +++ b/ports/cpp-netlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-netlib", "version-string": "0.13.0", - "port-version": 6, + "port-version": 7, "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", "homepage": "https://cpp-netlib.org/", "supports": "!uwp", @@ -12,6 +12,14 @@ "boost-program-options", "boost-scope-exit", "boost-smart-ptr", - "boost-spirit" + "boost-spirit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake index cd519b701a3092..4fad950680ddc1 100644 --- a/ports/cppcodec/portfile.cmake +++ b/ports/cppcodec/portfile.cmake @@ -7,19 +7,18 @@ vcpkg_from_github( PATCHES 0001-Fix-62.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/cppcodec/vcpkg.json b/ports/cppcodec/vcpkg.json index e685ad5eca926d..f22508c8f6f140 100644 --- a/ports/cppcodec/vcpkg.json +++ b/ports/cppcodec/vcpkg.json @@ -1,6 +1,16 @@ { "name": "cppcodec", "version": "0.2", - "port-version": 3, - "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." + "port-version": 4, + "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake index 8d92a0f2292dea..8516467590eac4 100644 --- a/ports/cppitertools/portfile.cmake +++ b/ports/cppitertools/portfile.cmake @@ -6,20 +6,19 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dcppitertools_INSTALL_CMAKE_DIR=share ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/share/cppitertools-config-version.cmake) + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/share/cppitertools-config-version.cmake") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppitertools +file(INSTALL "${SOURCE_PATH}/LICENSE.md" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/cppitertools" RENAME copyright) diff --git a/ports/cppitertools/vcpkg.json b/ports/cppitertools/vcpkg.json index 936e372f98810f..3f1529d9fba9d0 100644 --- a/ports/cppitertools/vcpkg.json +++ b/ports/cppitertools/vcpkg.json @@ -1,10 +1,18 @@ { "name": "cppitertools", "version": "2.1", - "port-version": 2, + "port-version": 3, "description": "Range-based for loop add-ons inspired by the Python builtins and itertools library", "homepage": "https://github.com/ryanhaining/cppitertools", "dependencies": [ - "boost-optional" + "boost-optional", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cppkafka/portfile.cmake b/ports/cppkafka/portfile.cmake index ccaee4ed4dcc48..047ed3602c8122 100644 --- a/ports/cppkafka/portfile.cmake +++ b/ports/cppkafka/portfile.cmake @@ -13,20 +13,19 @@ else() set(CPPKAFKA_BUILD_SHARED ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED} -DCPPKAFKA_DISABLE_TESTS=ON -DCPPKAFKA_DISABLE_EXAMPLES=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/cppkafka/vcpkg.json b/ports/cppkafka/vcpkg.json index 00473d9725c836..07bc7d0a2a0da7 100644 --- a/ports/cppkafka/vcpkg.json +++ b/ports/cppkafka/vcpkg.json @@ -1,11 +1,19 @@ { "name": "cppkafka", "version-string": "0.3.1", - "port-version": 3, + "port-version": 4, "description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.", "homepage": "https://github.com/mfontanini/cppkafka", "dependencies": [ "boost-program-options", - "librdkafka" + "librdkafka", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index f8f94aec13f7e0..0d1acab61d625e 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -10,20 +10,19 @@ vcpkg_from_github( fix-warning-c4834.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices -DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices -DUS_USE_SYSTEM_GTEST=TRUE ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets() +vcpkg_config_cmake_fixup() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 1ddf09e6e5c1df..c1c72f5e93d836 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cppmicroservices", "version": "3.6.0", + "port-version": 1, "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", "dependencies": [ - "gtest" + "gtest", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/ctbignum/portfile.cmake b/ports/ctbignum/portfile.cmake index 9bafbc9bac6658..1bc187727b3bcd 100644 --- a/ports/ctbignum/portfile.cmake +++ b/ports/ctbignum/portfile.cmake @@ -6,23 +6,21 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCTBIGNUM_BuildTests=OFF -DCTBIGNUM_BuildBenchmarks=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) # Remove empty files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION $"{CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ctbignum/vcpkg.json b/ports/ctbignum/vcpkg.json index 093dfbcfbf6b38..4c517ec653c1ea 100644 --- a/ports/ctbignum/vcpkg.json +++ b/ports/ctbignum/vcpkg.json @@ -1,10 +1,18 @@ { "name": "ctbignum", "version-string": "2019-08-02", - "port-version": 1, + "port-version": 2, "description": "This is a header-only template library for fixed-width \"small big-integer\" computations, for use during run-time as well as compile-time.", "homepage": "https://github.com/niekbouman/ctbignum", "dependencies": [ - "boost" + "boost", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake index f55a7c7e031e05..5377c9d1dc493d 100644 --- a/ports/ctemplate/portfile.cmake +++ b/ports/ctemplate/portfile.cmake @@ -6,19 +6,18 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_find_acquire_program(PYTHON3) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DPYTHON_EXECUTABLE=${PYTHON3}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctemplate RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ctemplate" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json index 3aa246f47277cd..040c6e8ff9b07a 100644 --- a/ports/ctemplate/vcpkg.json +++ b/ports/ctemplate/vcpkg.json @@ -1,8 +1,18 @@ { "name": "ctemplate", "version-date": "2020-09-14", - "port-version": 4, + "port-version": 5, "description": "C++ CTemplate system", "homepage": "https://github.com/OlafvdSpek/ctemplate", - "supports": "windows & !arm" + "supports": "windows & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake index 7ed6e4d5920086..88e352fc37e53c 100644 --- a/ports/darts-clone/portfile.cmake +++ b/ports/darts-clone/portfile.cmake @@ -9,19 +9,18 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am") -file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/darts-clone/vcpkg.json b/ports/darts-clone/vcpkg.json index e99a2315ff725a..575064863c7b36 100644 --- a/ports/darts-clone/vcpkg.json +++ b/ports/darts-clone/vcpkg.json @@ -1,6 +1,16 @@ { "name": "darts-clone", "version-string": "1767ab87cffe", - "port-version": 2, - "description": "A static double-array trie structure" + "port-version": 3, + "description": "A static double-array trie structure", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/dbow2/portfile.cmake b/ports/dbow2/portfile.cmake index 1518c782075e8b..cd7427e1172454 100644 --- a/ports/dbow2/portfile.cmake +++ b/ports/dbow2/portfile.cmake @@ -8,21 +8,18 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_Demo=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/DBoW2) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/DBoW2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/DBoW2/DBoW2Config.cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/DBoW2/DBoW2Config.cmake") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) - +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dbow2/vcpkg.json b/ports/dbow2/vcpkg.json index 6f0fec46d324ab..954bd3785840b2 100644 --- a/ports/dbow2/vcpkg.json +++ b/ports/dbow2/vcpkg.json @@ -1,10 +1,18 @@ { "name": "dbow2", "version-string": "2019-08-05", - "port-version": 1, + "port-version": 2, "description": "DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation.", "homepage": "https://github.com/dorian3d/DBoW2", "dependencies": [ - "opencv" + "opencv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/debug-assert/portfile.cmake b/ports/debug-assert/portfile.cmake index 41f9385fff7018..e32a2c8fb724cc 100644 --- a/ports/debug-assert/portfile.cmake +++ b/ports/debug-assert/portfile.cmake @@ -6,19 +6,18 @@ vcpkg_from_github( HEAD_REF v1.3.3 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDEBUG_ASSERT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/debug_assert TARGET_PATH share/debug_assert) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/debug_assert PACKAGE_NAME debug_assert) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/debug-assert/vcpkg.json b/ports/debug-assert/vcpkg.json index 413b23d303d7c8..2ed950c2c42ec1 100644 --- a/ports/debug-assert/vcpkg.json +++ b/ports/debug-assert/vcpkg.json @@ -1,6 +1,17 @@ { "name": "debug-assert", "version-string": "1.3.3", + "port-version": 1, "description": "Provides flexible DEBUG_ASSERT() macro.", - "homepage": "https://github.com/foonathan/debug_assert" + "homepage": "https://github.com/foonathan/debug_assert", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index 2b96e953ea0c58..ecbf318894c717 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_from_github( jasper-4.patch ) -file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake) +file(REMOVE "${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -28,9 +28,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS lcms IL_NO_LCMS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/DevIL - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/DevIL" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} @@ -39,12 +38,12 @@ vcpkg_configure_cmake( -DIL_USE_DXTC_SQUISH=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json index ff52c2fdedfb15..b58e683903d530 100644 --- a/ports/devil/vcpkg.json +++ b/ports/devil/vcpkg.json @@ -1,9 +1,19 @@ { "name": "devil", "version": "1.8.0", - "port-version": 9, + "port-version": 10, "description": "A full featured cross-platform image library", "homepage": "https://github.com/DentonW/DevIL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "jasper", "lcms", diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index ab3bec66bb71a6..f2073cc3af4c8e 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -8,17 +8,17 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL PATCHES include-cstdint.patch # allows compiling on newer versions of GCC ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(ARCH_FOLDER "x86") -else(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCH_FOLDER "x86_64") endif() @@ -35,13 +35,12 @@ elseif(VCPKG_TARGET_IS_LINUX) file(INSTALL "${SOURCE_PATH}/lib/${ARCH_FOLDER}/discord_game_sdk.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "libdiscord_game_sdk.so") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DSDK_LIB_FOLDER=${CURRENT_PACKAGES_DIR}/lib" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json index 5282f601ecc474..249c1bab8910d1 100644 --- a/ports/discord-game-sdk/vcpkg.json +++ b/ports/discord-game-sdk/vcpkg.json @@ -1,8 +1,18 @@ { "name": "discord-game-sdk", "version": "2.5.6", - "port-version": 4, + "port-version": 5, "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", - "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" + "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 9553f4de94107e..6a609408440ed7 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -8,25 +8,24 @@ vcpkg_from_github( ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) -file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty) +file(REMOVE_RECURSE "${SOURCE_PATH}/thirdparty") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_STATIC_CRT=${STATIC_CRT} -DBUILD_EXAMPLES=OFF -DRAPIDJSONTEST=TRUE - -DRAPIDJSON=${CURRENT_INSTALLED_DIR} + "-DRAPIDJSON=${CURRENT_INSTALLED_DIR}" ) if(EXISTS ${SOURCE_PATH}/thirdparty) message(FATAL_ERROR "The source directory should not be modified during the build.") endif() -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Copy copright information file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/discord-rpc" RENAME "copyright") diff --git a/ports/discord-rpc/vcpkg.json b/ports/discord-rpc/vcpkg.json index 12ab91796302b3..129d0d9fb29732 100644 --- a/ports/discord-rpc/vcpkg.json +++ b/ports/discord-rpc/vcpkg.json @@ -1,10 +1,18 @@ { "name": "discord-rpc", "version-string": "3.4.0", - "port-version": 1, + "port-version": 2, "description": "Rich Presence allows you to leverage the totally overhauled \"Now Playing\" section in a Discord user's profile to help people play your game together.", "homepage": "https://github.com/discordapp/discord-rpc", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake index bac98be811c119..ed3cbd8d1233bf 100644 --- a/ports/discount/portfile.cmake +++ b/ports/discount/portfile.cmake @@ -23,17 +23,16 @@ if(NOT GENERATE_BLOCKTAGS) message(STATUS "Copied blocktags") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/cmake" - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DDISCOUNT_ONLY_LIBRARY=ON -DGENERATE_BLOCKTAGS=${GENERATE_BLOCKTAGS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/discount) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/discount) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/discount/vcpkg.json b/ports/discount/vcpkg.json index 7fcbc5103fc27c..ca994332f89d15 100644 --- a/ports/discount/vcpkg.json +++ b/ports/discount/vcpkg.json @@ -1,7 +1,17 @@ { "name": "discount", "version-string": "2.2.6", - "port-version": 1, + "port-version": 2, "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", - "homepage": "https://github.com/Orc/discount" + "homepage": "https://github.com/Orc/discount", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/discreture/portfile.cmake b/ports/discreture/portfile.cmake index 51bec5feb3d650..e3ba24b4163136 100644 --- a/ports/discreture/portfile.cmake +++ b/ports/discreture/portfile.cmake @@ -6,16 +6,14 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/discreture/vcpkg.json b/ports/discreture/vcpkg.json index f5869ba4cf5dd6..629b3e6543fd65 100644 --- a/ports/discreture/vcpkg.json +++ b/ports/discreture/vcpkg.json @@ -1,11 +1,19 @@ { "name": "discreture", "version-string": "2020-01-29", - "port-version": 1, + "port-version": 2, "description": "A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more.", "homepage": "https://github.com/mraggi/discreture", "dependencies": [ "boost-container", - "boost-iterator" + "boost-iterator", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake index 03c6fd63735c4c..835fd7da8dc29c 100644 --- a/ports/docopt/portfile.cmake +++ b/ports/docopt/portfile.cmake @@ -10,35 +10,34 @@ vcpkg_from_github( install-one-flavor.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_EXAMPLE=OFF -DWITH_TESTS=OFF -DUSE_BOOST_REGEX=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/docopt) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/docopt) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(READ ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h _contents) + file(READ "${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h" _contents) string(REPLACE "#ifdef DOCOPT_DLL" "#if 1" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/include/docopt/docopt.h" "${_contents}") endif() # Header-only style when DOCOPT_HEADER_ONLY is defined file(COPY - ${SOURCE_PATH}/docopt.cpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include/docopt) + "${SOURCE_PATH}/docopt.cpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/docopt") # Handle copyright file(INSTALL - ${SOURCE_PATH}/LICENSE-MIT - DESTINATION ${CURRENT_PACKAGES_DIR}/share/docopt RENAME copyright) + "${SOURCE_PATH}/LICENSE-MIT" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/docopt" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/docopt/vcpkg.json b/ports/docopt/vcpkg.json index 8e17436c418154..df30626d73cafd 100644 --- a/ports/docopt/vcpkg.json +++ b/ports/docopt/vcpkg.json @@ -1,6 +1,16 @@ { "name": "docopt", "version-string": "2018-11-01", - "port-version": 1, - "description": "Command line arguments parser that will make you smile (C++11 port)." + "port-version": 2, + "description": "Command line arguments parser that will make you smile (C++11 port).", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index abdc8aa1d7ce23..c12422456a3113 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -10,9 +10,9 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") if (VCPKG_TARGET_IS_WINDOWS) set(EXECUTABLE_SUFFIX ".exe") @@ -26,8 +26,8 @@ vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path("${PYTHON2_DIR}") -if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}) - if(NOT EXISTS ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}) +if(NOT EXISTS "${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}") vcpkg_from_github( OUT_SOURCE_PATH PYFILE_PATH REPO pypa/get-pip @@ -50,27 +50,26 @@ vcpkg_execute_required_process( if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h") - file(READ ${DUK_CONFIG_H_PATH} CONTENT) + file(READ "${DUK_CONFIG_H_PATH}" CONTENT) string(REPLACE "#undef DUK_F_DLL_BUILD" "#define DUK_F_DLL_BUILD" CONTENT "${CONTENT}") - file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}") + file(WRITE "${DUK_CONFIG_H_PATH}" "${CONTENT}") else() set(DUK_CONFIG_H_PATH "${SOURCE_PATH}/src/duk_config.h") - file(READ ${DUK_CONFIG_H_PATH} CONTENT) + file(READ "${DUK_CONFIG_H_PATH}" CONTENT) string(REPLACE "#define DUK_F_DLL_BUILD" "#undef DUK_F_DLL_BUILD" CONTENT "${CONTENT}") - file(WRITE ${DUK_CONFIG_H_PATH} "${CONTENT}") + file(WRITE "${DUK_CONFIG_H_PATH}" "${CONTENT}") endif() -vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets() +vcpkg_config_cmake_fixup() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/duktape/vcpkg.json b/ports/duktape/vcpkg.json index 59a78b9d6dcc7f..cada97aea081af 100644 --- a/ports/duktape/vcpkg.json +++ b/ports/duktape/vcpkg.json @@ -1,7 +1,17 @@ { "name": "duktape", "version-string": "2.5.0", - "port-version": 2, + "port-version": 3, "description": "Embeddable Javascript engine with a focus on portability and compact footprint.", - "homepage": "https://github.com/svaarala/duktape" + "homepage": "https://github.com/svaarala/duktape", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/eabase/portfile.cmake b/ports/eabase/portfile.cmake index 8ebb2ab1498f72..b3363d875bd15a 100644 --- a/ports/eabase/portfile.cmake +++ b/ports/eabase/portfile.cmake @@ -10,21 +10,20 @@ vcpkg_from_github( fix_cmake_install.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEABASE_BUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EABase) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/EABase) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/eabase/vcpkg.json b/ports/eabase/vcpkg.json index d9032602ca520d..1b503d8c71f462 100644 --- a/ports/eabase/vcpkg.json +++ b/ports/eabase/vcpkg.json @@ -1,7 +1,17 @@ { "name": "eabase", "version-string": "2.09.12", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.", - "homepage": "https://github.com/electronicarts/EABase" + "homepage": "https://github.com/electronicarts/EABase", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } From 29f05f3bf27f0ede2769fddcfc121f65353f8699 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:42:01 +0800 Subject: [PATCH 02/14] version --- versions/a-/absent.json | 5 ++ versions/a-/ade.json | 5 ++ versions/a-/alac-decoder.json | 5 ++ versions/a-/aliyun-oss-c-sdk.json | 5 ++ versions/a-/ampl-mp.json | 5 ++ versions/a-/anyrpc.json | 5 ++ versions/a-/argagg.json | 5 ++ versions/a-/argumentum.json | 5 ++ versions/a-/azure-storage-cpp.json | 5 ++ versions/b-/behaviortree-cpp.json | 5 ++ versions/b-/berkeleydb.json | 5 ++ versions/b-/bigint.json | 5 ++ versions/b-/binn.json | 5 ++ versions/b-/blas.json | 5 ++ versions/b-/butteraugli.json | 5 ++ versions/baseline.json | 96 ++++++++++++++-------------- versions/c-/cctz.json | 5 ++ versions/c-/cello.json | 5 ++ versions/c-/cfitsio.json | 5 ++ versions/c-/cgicc.json | 5 ++ versions/c-/chipmunk.json | 5 ++ versions/c-/chromaprint.json | 5 ++ versions/c-/clamav.json | 5 ++ versions/c-/clapack.json | 5 ++ versions/c-/cmcstl2.json | 5 ++ versions/c-/cnl.json | 5 ++ versions/c-/coin.json | 5 ++ versions/c-/concurrentqueue.json | 5 ++ versions/c-/constexpr-contracts.json | 5 ++ versions/c-/coroutine.json | 5 ++ versions/c-/corrade.json | 5 ++ versions/c-/cpp-netlib.json | 5 ++ versions/c-/cppcodec.json | 5 ++ versions/c-/cppitertools.json | 5 ++ versions/c-/cppkafka.json | 5 ++ versions/c-/cppmicroservices.json | 5 ++ versions/c-/ctbignum.json | 5 ++ versions/c-/ctemplate.json | 5 ++ versions/d-/darts-clone.json | 5 ++ versions/d-/dbow2.json | 5 ++ versions/d-/debug-assert.json | 5 ++ versions/d-/devil.json | 5 ++ versions/d-/discord-game-sdk.json | 5 ++ versions/d-/discord-rpc.json | 5 ++ versions/d-/discount.json | 5 ++ versions/d-/discreture.json | 5 ++ versions/d-/docopt.json | 5 ++ versions/d-/duktape.json | 5 ++ versions/e-/eabase.json | 5 ++ 49 files changed, 288 insertions(+), 48 deletions(-) diff --git a/versions/a-/absent.json b/versions/a-/absent.json index 7d0a280eaa4bc1..e6148197f4b4e0 100644 --- a/versions/a-/absent.json +++ b/versions/a-/absent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4245977c7070822c223161421a31aa6fe5042017", + "version-string": "0.3.1", + "port-version": 2 + }, { "git-tree": "d1f1f8e5f036e686e2a7881d4b8594f737196090", "version-string": "0.3.1", diff --git a/versions/a-/ade.json b/versions/a-/ade.json index 063198687b8a2d..e93cef70199961 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1fe12280de42d63d57dd77fd43ac40a7840bae5", + "version-string": "0.1.1f", + "port-version": 3 + }, { "git-tree": "ca6a81fb330a77f6aa4c58b63af7efcbe1643e62", "version-string": "0.1.1f", diff --git a/versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json index 2a58e747807467..aee654134bcc15 100644 --- a/versions/a-/alac-decoder.json +++ b/versions/a-/alac-decoder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35bb87b6ce7ee4d044c277ca3428c8745f8ebd84", + "version-string": "0.2", + "port-version": 6 + }, { "git-tree": "e4bc6809ac5b52236ec0ea4d48cfa904f493ab21", "version-string": "0.2", diff --git a/versions/a-/aliyun-oss-c-sdk.json b/versions/a-/aliyun-oss-c-sdk.json index 724871e0279317..daa8ae436b2a0d 100644 --- a/versions/a-/aliyun-oss-c-sdk.json +++ b/versions/a-/aliyun-oss-c-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7723df9c199b9db1faf48a7d02c14bfe771c937", + "version-string": "3.10.0", + "port-version": 2 + }, { "git-tree": "52b0340f3b53966018738d256f74a64c0c90ee5e", "version-string": "3.10.0", diff --git a/versions/a-/ampl-mp.json b/versions/a-/ampl-mp.json index 15bbff6a2811ee..b56e1077051686 100644 --- a/versions/a-/ampl-mp.json +++ b/versions/a-/ampl-mp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adc07c10ee68ac3ebb3ea916bc4a62bf1ceaf5cc", + "version-date": "2020-11-11", + "port-version": 4 + }, { "git-tree": "b3bdafa2896aad8990e3886bdd83b8cd5538e7ea", "version-date": "2020-11-11", diff --git a/versions/a-/anyrpc.json b/versions/a-/anyrpc.json index d1cfc15bcd5240..1e891758e3b154 100644 --- a/versions/a-/anyrpc.json +++ b/versions/a-/anyrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7107508242583ccad112dff94cf61984392070", + "version-date": "2021-08-24", + "port-version": 2 + }, { "git-tree": "e257a3e62f570c677889ee84e28b96536159e324", "version-date": "2021-08-24", diff --git a/versions/a-/argagg.json b/versions/a-/argagg.json index 94f1d5e2427f97..930e71e80f9bc3 100644 --- a/versions/a-/argagg.json +++ b/versions/a-/argagg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89a9b4bc7d3ecb518a5a78d3ce9731cf974df7f8", + "version-string": "0.4.6", + "port-version": 2 + }, { "git-tree": "ece15f0bd5649973a8384d7762b0b1aed0cb2fdc", "version-string": "0.4.6", diff --git a/versions/a-/argumentum.json b/versions/a-/argumentum.json index bfd12408d6bc6a..38bd8a950f16a8 100644 --- a/versions/a-/argumentum.json +++ b/versions/a-/argumentum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe42808ab9e1d7f94eb77d40dd8777a0a2510837", + "version-string": "0.3.1", + "port-version": 2 + }, { "git-tree": "0f89899e28a328451a1b31bbf2ba23df8ca87f69", "version-string": "0.3.1", diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index 7a9f8412560b0b..39ab19170ee4ab 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "245884377d005f8265e75b9b6eff339d687de0e9", + "version-string": "7.5.0", + "port-version": 4 + }, { "git-tree": "8216ff9a5060864170113353495400e342d862ad", "version-string": "7.5.0", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index 9268e1e6e7c7d0..c5e966d5b968e1 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22329bcd29c8bc22d0c6c652c9ff3cc7af68fbe2", + "version": "3.5.6", + "port-version": 3 + }, { "git-tree": "79f662c115d97eb11ef1a08753aed0eef061d7cc", "version": "3.5.6", diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json index 49497baa4add33..f0101edbd1075e 100644 --- a/versions/b-/berkeleydb.json +++ b/versions/b-/berkeleydb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbf0b1ba091dbfa0c22f8750d83065ebe1eac28a", + "version": "4.8.30", + "port-version": 9 + }, { "git-tree": "27ed2f8c5c5b6c5ba677703f69d9e83062ff6c86", "version": "4.8.30", diff --git a/versions/b-/bigint.json b/versions/b-/bigint.json index 48e25a21a93305..174075f53ed94b 100644 --- a/versions/b-/bigint.json +++ b/versions/b-/bigint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08eead69719a039b1785cd2b5675a03f3162b9ad", + "version-string": "2010.04.30", + "port-version": 8 + }, { "git-tree": "ae8921f17a82f01e5e68e494c8fe1823085eb496", "version-string": "2010.04.30", diff --git a/versions/b-/binn.json b/versions/b-/binn.json index fb32ec7dc07bb6..9de7af6da4e6e5 100644 --- a/versions/b-/binn.json +++ b/versions/b-/binn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef73e4b20836cfc1913984d75d560f331b51fc1", + "version-string": "3.0", + "port-version": 2 + }, { "git-tree": "6b63ed963e5305d28e67ee04951cb907a483bca2", "version-string": "3.0", diff --git a/versions/b-/blas.json b/versions/b-/blas.json index c8b3ade64a24bc..a1139c63bd993e 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13cc4359c6888f16fdde35e618096b67a9177a6b", + "version-string": "1", + "port-version": 2 + }, { "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", "version-string": "1", diff --git a/versions/b-/butteraugli.json b/versions/b-/butteraugli.json index 1fee95296c761b..81c07708449847 100644 --- a/versions/b-/butteraugli.json +++ b/versions/b-/butteraugli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a06f382d1c12d38bd578aca7d4cfe4a94b9e492", + "version-string": "2019-05-08", + "port-version": 3 + }, { "git-tree": "660959f50cba9f2fa2bc5d9cf775e268d746c7e9", "version-string": "2019-05-08", diff --git a/versions/baseline.json b/versions/baseline.json index a83a6390709e65..bbde7c2508684e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "absent": { "baseline": "0.3.1", - "port-version": 1 + "port-version": 2 }, "ace": { "baseline": "7.0.11", @@ -38,7 +38,7 @@ }, "ade": { "baseline": "0.1.1f", - "port-version": 2 + "port-version": 3 }, "adios2": { "baseline": "2.8.3", @@ -66,7 +66,7 @@ }, "alac-decoder": { "baseline": "0.2", - "port-version": 5 + "port-version": 6 }, "alembic": { "baseline": "1.8.3", @@ -74,7 +74,7 @@ }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", - "port-version": 1 + "port-version": 2 }, "allegro5": { "baseline": "5.2.6.0", @@ -102,7 +102,7 @@ }, "ampl-mp": { "baseline": "2020-11-11", - "port-version": 3 + "port-version": 4 }, "amqpcpp": { "baseline": "4.3.19", @@ -130,7 +130,7 @@ }, "anyrpc": { "baseline": "2021-08-24", - "port-version": 1 + "port-version": 2 }, "aom": { "baseline": "3.5.0", @@ -166,7 +166,7 @@ }, "argagg": { "baseline": "0.4.6", - "port-version": 1 + "port-version": 2 }, "argh": { "baseline": "1.3.2", @@ -194,7 +194,7 @@ }, "argumentum": { "baseline": "0.3.1", - "port-version": 1 + "port-version": 2 }, "aricpp": { "baseline": "1.1.2", @@ -422,7 +422,7 @@ }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 3 + "port-version": 4 }, "azure-storage-files-datalake-cpp": { "baseline": "12.5.0", @@ -478,7 +478,7 @@ }, "behaviortree-cpp": { "baseline": "3.5.6", - "port-version": 2 + "port-version": 3 }, "benchmark": { "baseline": "1.7.1", @@ -490,7 +490,7 @@ }, "berkeleydb": { "baseline": "4.8.30", - "port-version": 8 + "port-version": 9 }, "bext-di": { "baseline": "1.2.0", @@ -518,7 +518,7 @@ }, "bigint": { "baseline": "2010.04.30", - "port-version": 7 + "port-version": 8 }, "binlog": { "baseline": "2021-04-16", @@ -526,7 +526,7 @@ }, "binn": { "baseline": "3.0", - "port-version": 1 + "port-version": 2 }, "bitmagic": { "baseline": "7.12.3", @@ -562,7 +562,7 @@ }, "blas": { "baseline": "1", - "port-version": 1 + "port-version": 2 }, "blaze": { "baseline": "3.8.1", @@ -1270,7 +1270,7 @@ }, "butteraugli": { "baseline": "2019-05-08", - "port-version": 2 + "port-version": 3 }, "byte-lite": { "baseline": "0.3.0", @@ -1374,7 +1374,7 @@ }, "cctz": { "baseline": "2.3", - "port-version": 3 + "port-version": 4 }, "celero": { "baseline": "2.8.5", @@ -1382,7 +1382,7 @@ }, "cello": { "baseline": "2019-07-23", - "port-version": 2 + "port-version": 3 }, "cereal": { "baseline": "1.3.2", @@ -1394,7 +1394,7 @@ }, "cfitsio": { "baseline": "3.49", - "port-version": 2 + "port-version": 3 }, "cgal": { "baseline": "5.5.1", @@ -1402,7 +1402,7 @@ }, "cgicc": { "baseline": "3.2.19", - "port-version": 5 + "port-version": 6 }, "cgl": { "baseline": "0.60.3", @@ -1442,7 +1442,7 @@ }, "chipmunk": { "baseline": "7.0.3", - "port-version": 2 + "port-version": 3 }, "chmlib": { "baseline": "0.40", @@ -1450,7 +1450,7 @@ }, "chromaprint": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "chromium-base": { "baseline": "86.0.4199.1", @@ -1482,11 +1482,11 @@ }, "clamav": { "baseline": "0.103.0", - "port-version": 3 + "port-version": 4 }, "clapack": { "baseline": "3.2.1", - "port-version": 20 + "port-version": 21 }, "clara": { "baseline": "1.1.5", @@ -1554,7 +1554,7 @@ }, "cmcstl2": { "baseline": "2019-07-20", - "port-version": 1 + "port-version": 2 }, "cminpack": { "baseline": "1.3.8", @@ -1570,7 +1570,7 @@ }, "cnl": { "baseline": "1.1.7", - "port-version": 1 + "port-version": 2 }, "co": { "baseline": "2.0.3", @@ -1582,7 +1582,7 @@ }, "coin": { "baseline": "4.0.0", - "port-version": 5 + "port-version": 6 }, "coin-or-buildtools": { "baseline": "2023-02-02", @@ -1642,7 +1642,7 @@ }, "concurrentqueue": { "baseline": "1.0.3", - "port-version": 0 + "port-version": 1 }, "configcat": { "baseline": "1.0.0", @@ -1658,7 +1658,7 @@ }, "constexpr-contracts": { "baseline": "2020-08-09", - "port-version": 1 + "port-version": 2 }, "continuable": { "baseline": "4.2.0", @@ -1674,11 +1674,11 @@ }, "coroutine": { "baseline": "1.5.0", - "port-version": 4 + "port-version": 5 }, "corrade": { "baseline": "2020.06", - "port-version": 4 + "port-version": 5 }, "cpp-base64": { "baseline": "V2.rc.08", @@ -1698,7 +1698,7 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 6 + "port-version": 7 }, "cpp-peglib": { "baseline": "1.3.10", @@ -1726,7 +1726,7 @@ }, "cppcodec": { "baseline": "0.2", - "port-version": 3 + "port-version": 4 }, "cppcoro": { "baseline": "2022-10-25", @@ -1742,15 +1742,15 @@ }, "cppitertools": { "baseline": "2.1", - "port-version": 2 + "port-version": 3 }, "cppkafka": { "baseline": "0.3.1", - "port-version": 3 + "port-version": 4 }, "cppmicroservices": { "baseline": "3.6.0", - "port-version": 0 + "port-version": 1 }, "cpprestsdk": { "baseline": "2.10.18", @@ -1842,11 +1842,11 @@ }, "ctbignum": { "baseline": "2019-08-02", - "port-version": 1 + "port-version": 2 }, "ctemplate": { "baseline": "2020-09-14", - "port-version": 4 + "port-version": 5 }, "ctp": { "baseline": "6.6.1_P1_20210406_se", @@ -1930,7 +1930,7 @@ }, "darts-clone": { "baseline": "1767ab87cffe", - "port-version": 2 + "port-version": 3 }, "dartsim": { "baseline": "6.12.2", @@ -1970,7 +1970,7 @@ }, "dbow2": { "baseline": "2019-08-05", - "port-version": 1 + "port-version": 2 }, "dbow3": { "baseline": "1.0.0", @@ -1986,7 +1986,7 @@ }, "debug-assert": { "baseline": "1.3.3", - "port-version": 0 + "port-version": 1 }, "decimal-for-cpp": { "baseline": "1.18", @@ -2002,7 +2002,7 @@ }, "devil": { "baseline": "1.8.0", - "port-version": 9 + "port-version": 10 }, "dimcli": { "baseline": "7.1.0", @@ -2046,11 +2046,11 @@ }, "discord-game-sdk": { "baseline": "2.5.6", - "port-version": 4 + "port-version": 5 }, "discord-rpc": { "baseline": "3.4.0", - "port-version": 1 + "port-version": 2 }, "discordcoreapi": { "baseline": "2023-01-02", @@ -2058,11 +2058,11 @@ }, "discount": { "baseline": "2.2.6", - "port-version": 1 + "port-version": 2 }, "discreture": { "baseline": "2020-01-29", - "port-version": 1 + "port-version": 2 }, "distorm": { "baseline": "3.5.2b", @@ -2082,7 +2082,7 @@ }, "docopt": { "baseline": "2018-11-01", - "port-version": 1 + "port-version": 2 }, "doctest": { "baseline": "2.4.9", @@ -2130,7 +2130,7 @@ }, "duktape": { "baseline": "2.5.0", - "port-version": 2 + "port-version": 3 }, "dv-processing": { "baseline": "1.7.8", @@ -2150,7 +2150,7 @@ }, "eabase": { "baseline": "2.09.12", - "port-version": 2 + "port-version": 3 }, "earcut-hpp": { "baseline": "2.2.4", diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index d93ed179261034..312ef77bd9d5e2 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd80df05059d180966bd338eae912c5972847981", + "version-string": "2.3", + "port-version": 4 + }, { "git-tree": "b61e635e32027714e10e682235c9f3c5b8b1b1e9", "version-string": "2.3", diff --git a/versions/c-/cello.json b/versions/c-/cello.json index de140e58f25a32..0d76a213787e73 100644 --- a/versions/c-/cello.json +++ b/versions/c-/cello.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a529f8f5fcd96900023ead2ab9bbf3ccc4d81ed8", + "version-date": "2019-07-23", + "port-version": 3 + }, { "git-tree": "a281b67048d19f8136aaa8e0198b1db5dec5c4dd", "version-date": "2019-07-23", diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index 42b71d6faf9889..a7dc9f47055759 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0718def60f74b4a2126c4658ffc8e346a7145f6f", + "version": "3.49", + "port-version": 3 + }, { "git-tree": "bc1418de4f14dd9c1a7e9c9ebc8d8015e1769935", "version": "3.49", diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json index dadc9573594247..a24a186ca0b758 100644 --- a/versions/c-/cgicc.json +++ b/versions/c-/cgicc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2ca742f8ab20fd25b69d948c22195e1d9b8dafb", + "version-string": "3.2.19", + "port-version": 6 + }, { "git-tree": "a6113e1a5fcadb00943ea3775b6978950b387903", "version-string": "3.2.19", diff --git a/versions/c-/chipmunk.json b/versions/c-/chipmunk.json index f785d5eb8495bc..9c1e1af231e9e5 100644 --- a/versions/c-/chipmunk.json +++ b/versions/c-/chipmunk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d56c98d1d491f822d5f74d312e45b51a0cfccfc", + "version-string": "7.0.3", + "port-version": 3 + }, { "git-tree": "d50838914429dd39c93a8d0974b4f786c53be83f", "version-string": "7.0.3", diff --git a/versions/c-/chromaprint.json b/versions/c-/chromaprint.json index a97cedf9ced3e9..1ac3ded2e6bb17 100644 --- a/versions/c-/chromaprint.json +++ b/versions/c-/chromaprint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d50d41c54f3aa2854ae05e64715100761517cb31", + "version": "1.5.0", + "port-version": 2 + }, { "git-tree": "d841d451ed68f08043a27b2ec0beb24d3a276c81", "version": "1.5.0", diff --git a/versions/c-/clamav.json b/versions/c-/clamav.json index 645312b20e6142..09e10a7e3a99a8 100644 --- a/versions/c-/clamav.json +++ b/versions/c-/clamav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6af13bd82992b466df39229e4d4045895dbd023", + "version-semver": "0.103.0", + "port-version": 4 + }, { "git-tree": "36dda0d43469bb23e4d56b170e40261b810509f1", "version-semver": "0.103.0", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 421ccf45a63691..eb16e61166f6cd 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dddc8e8cd6bf3bfd4b99cb6d270f4255366c3af", + "version": "3.2.1", + "port-version": 21 + }, { "git-tree": "2fd47cedfcd13b7c3a339c7acf4b89c14caea8d5", "version": "3.2.1", diff --git a/versions/c-/cmcstl2.json b/versions/c-/cmcstl2.json index 21a166007e1ed2..6c5faecc4c151a 100644 --- a/versions/c-/cmcstl2.json +++ b/versions/c-/cmcstl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43898aa773df80a4310bf6e037191dcdd7916d56", + "version-string": "2019-07-20", + "port-version": 2 + }, { "git-tree": "b42b47d62175c38caf3f6b8f31256bb316284734", "version-string": "2019-07-20", diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index a7f667331c872e..ac2734149e5975 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c23cba13bb528c8b41719fd4c8031269044363f", + "version-string": "1.1.7", + "port-version": 2 + }, { "git-tree": "3fe1aa7188d2e673265a0c1f20616bdf647c7390", "version-string": "1.1.7", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 006d2f924da567..e43c71dc741040 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d9bd568013061a539276bd6b5d930b7ed5517ba", + "version-string": "4.0.0", + "port-version": 6 + }, { "git-tree": "e974f1b74758c3af03beefadef6f060437a2af69", "version-string": "4.0.0", diff --git a/versions/c-/concurrentqueue.json b/versions/c-/concurrentqueue.json index 444fe721b1b2f4..7439bb2c9d1000 100644 --- a/versions/c-/concurrentqueue.json +++ b/versions/c-/concurrentqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb04aeabcbe9b92bef661662137d0ef23cf3816f", + "version": "1.0.3", + "port-version": 1 + }, { "git-tree": "929e70702c63103c0ec48d7de8cfe3da02f699ba", "version": "1.0.3", diff --git a/versions/c-/constexpr-contracts.json b/versions/c-/constexpr-contracts.json index 7a711ef7c2ab40..952a996f7d4651 100644 --- a/versions/c-/constexpr-contracts.json +++ b/versions/c-/constexpr-contracts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50dd2e08491cb594c03341844a85b9be6a616a88", + "version-string": "2020-08-09", + "port-version": 2 + }, { "git-tree": "0fcdc4b7a9e49416833b834a6be2c17254a7e9c7", "version-string": "2020-08-09", diff --git a/versions/c-/coroutine.json b/versions/c-/coroutine.json index 9f4f3905a3bae2..e2aa97ed3ee329 100644 --- a/versions/c-/coroutine.json +++ b/versions/c-/coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14c8577342a5f29b023637fc4fbb9ef899f19aa6", + "version": "1.5.0", + "port-version": 5 + }, { "git-tree": "c1ce0f42bbf3898d3421a3c7b6494f69853385f5", "version": "1.5.0", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index f32bd03b909a20..a15500a6d89cae 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed547a7951672a5a7b1c430df8a9b179f674ac6", + "version-string": "2020.06", + "port-version": 5 + }, { "git-tree": "91ad9b127c41c0538051a0c81e2cb9206a2587dd", "version-string": "2020.06", diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 448a858494ed30..56ad6ca9e749ab 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5551fb5403cbfa681f247a42da7749863645baa3", + "version-string": "0.13.0", + "port-version": 7 + }, { "git-tree": "49ff4ae830f2e1ae9141ea3155c6d962ca1c7946", "version-string": "0.13.0", diff --git a/versions/c-/cppcodec.json b/versions/c-/cppcodec.json index 196cd3b0fc0ec6..2243de5946b9cc 100644 --- a/versions/c-/cppcodec.json +++ b/versions/c-/cppcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c113d2ea70af2571436215a28fb1c880605a1c24", + "version": "0.2", + "port-version": 4 + }, { "git-tree": "c2b218c7d3aef05b777ea2537d59b6d1aa2bbf4e", "version": "0.2", diff --git a/versions/c-/cppitertools.json b/versions/c-/cppitertools.json index fe5a24f75c1005..afdf65cad2d970 100644 --- a/versions/c-/cppitertools.json +++ b/versions/c-/cppitertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b982722ea8f4a1a9d6178b9b3eacd78a7fa96590", + "version": "2.1", + "port-version": 3 + }, { "git-tree": "8373c4fe2df5953309d3fc443ceed59553d35824", "version": "2.1", diff --git a/versions/c-/cppkafka.json b/versions/c-/cppkafka.json index c54ec8a4f9b5c2..f110481941c151 100644 --- a/versions/c-/cppkafka.json +++ b/versions/c-/cppkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c06b1731643d212f178623c88e8319c4c40104dc", + "version-string": "0.3.1", + "port-version": 4 + }, { "git-tree": "749993fee4605134bbe7a5e9a451c959519f4dbf", "version-string": "0.3.1", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 0ab78b6200af7d..3ea9b0ad64b75b 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1782099e7623d0a80dbea80f4c8850410571c57", + "version": "3.6.0", + "port-version": 1 + }, { "git-tree": "df21454215c4d4d1106621ead01a95a199163b60", "version": "3.6.0", diff --git a/versions/c-/ctbignum.json b/versions/c-/ctbignum.json index 676be5da86c34e..6aecc13cd0d815 100644 --- a/versions/c-/ctbignum.json +++ b/versions/c-/ctbignum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f459b6a4606fb1759bbe001fa29829eee62f031", + "version-string": "2019-08-02", + "port-version": 2 + }, { "git-tree": "88ce498c3810046ebfe6500157691bf21a85eb07", "version-string": "2019-08-02", diff --git a/versions/c-/ctemplate.json b/versions/c-/ctemplate.json index badf8947584c70..b15943d9857bdb 100644 --- a/versions/c-/ctemplate.json +++ b/versions/c-/ctemplate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2819a29b40ae309a7f6355cdf1ca03b23ef8e4c9", + "version-date": "2020-09-14", + "port-version": 5 + }, { "git-tree": "b3f163cc201cb05bf66a1c4880428f9f7be4170b", "version-date": "2020-09-14", diff --git a/versions/d-/darts-clone.json b/versions/d-/darts-clone.json index 40a98fec164cf6..efb8aa1b1b7976 100644 --- a/versions/d-/darts-clone.json +++ b/versions/d-/darts-clone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5239abd7c41aedf5fe2f2e00e0f781824a442e75", + "version-string": "1767ab87cffe", + "port-version": 3 + }, { "git-tree": "1d75f114575faaf58492d7eca28e5caa3768811a", "version-string": "1767ab87cffe", diff --git a/versions/d-/dbow2.json b/versions/d-/dbow2.json index c37665c6b6bccf..e97e2ba35efcd9 100644 --- a/versions/d-/dbow2.json +++ b/versions/d-/dbow2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25afdb1d878ebef443f358c4a491b0ef1ced49c2", + "version-string": "2019-08-05", + "port-version": 2 + }, { "git-tree": "ef7b9edee49702a3735f18624888b98d249a80ef", "version-string": "2019-08-05", diff --git a/versions/d-/debug-assert.json b/versions/d-/debug-assert.json index 99356b87ce68e7..28529c8402f48e 100644 --- a/versions/d-/debug-assert.json +++ b/versions/d-/debug-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "521ac7e2f4eb66e08c88971256706658165b20aa", + "version-string": "1.3.3", + "port-version": 1 + }, { "git-tree": "06dae04f139744f1065ed1a6ed41631c6a431a5c", "version-string": "1.3.3", diff --git a/versions/d-/devil.json b/versions/d-/devil.json index 04d2e17473652f..b6fba8b5c85816 100644 --- a/versions/d-/devil.json +++ b/versions/d-/devil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed3ecd6484dfd9737eee0c415817fdddffcc03e2", + "version": "1.8.0", + "port-version": 10 + }, { "git-tree": "d964e038164d45273418c1a197e7bd7d08f2f860", "version": "1.8.0", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index 636bbfe88ea787..38579201e61b28 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50927a8f85bc14dc750b3e212361d6d6e68598a", + "version": "2.5.6", + "port-version": 5 + }, { "git-tree": "792eac2fec1f5fbeff9cd819c73a08b8eefabb14", "version": "2.5.6", diff --git a/versions/d-/discord-rpc.json b/versions/d-/discord-rpc.json index 330ebf037652fa..eb420539ee1a55 100644 --- a/versions/d-/discord-rpc.json +++ b/versions/d-/discord-rpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f69d097fd478421946aceaaca5b2fca43de4f20", + "version-string": "3.4.0", + "port-version": 2 + }, { "git-tree": "8b2b68ae08dffdf7b990d40a34b1ea53621aa856", "version-string": "3.4.0", diff --git a/versions/d-/discount.json b/versions/d-/discount.json index f58d95ef1bfc74..4df1ec19126492 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa7d3f040afd2f8ffdabc170fd5b89b9b30cc6e2", + "version-string": "2.2.6", + "port-version": 2 + }, { "git-tree": "28fe4ebbd4c5a94313b661b5ff5b0751ad186a69", "version-string": "2.2.6", diff --git a/versions/d-/discreture.json b/versions/d-/discreture.json index 42c62e2032d184..315b4bdda9d59b 100644 --- a/versions/d-/discreture.json +++ b/versions/d-/discreture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99f5fe641e52f034dc3fe62f2b5372d772a5ce42", + "version-string": "2020-01-29", + "port-version": 2 + }, { "git-tree": "ff9bb91c1f3a20a851b95e33cba5f682c2f95fd4", "version-string": "2020-01-29", diff --git a/versions/d-/docopt.json b/versions/d-/docopt.json index 571cee5e28bbde..2e692905288f9a 100644 --- a/versions/d-/docopt.json +++ b/versions/d-/docopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533710de59acee31dbc82e4ac4c214e41b711678", + "version-string": "2018-11-01", + "port-version": 2 + }, { "git-tree": "8af85233a92e8e8b249d61a56c50ef2c6704909b", "version-string": "2018-11-01", diff --git a/versions/d-/duktape.json b/versions/d-/duktape.json index b1f2e3bb233837..2eb41c7728df96 100644 --- a/versions/d-/duktape.json +++ b/versions/d-/duktape.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1b8814b8ff907c82c4a3ba254f45f67f8a84746", + "version-string": "2.5.0", + "port-version": 3 + }, { "git-tree": "1882f1d359d8c0463a3c7e9d41804a3a9df8f5f9", "version-string": "2.5.0", diff --git a/versions/e-/eabase.json b/versions/e-/eabase.json index db64610917362b..13620bf787da4d 100644 --- a/versions/e-/eabase.json +++ b/versions/e-/eabase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28f94fc47e3bb5b45856432705e69ad590d66664", + "version-string": "2.09.12", + "port-version": 3 + }, { "git-tree": "40dfd9d387e788a7987db75e0d9fc22786b8e43b", "version-string": "2.09.12", From 1528272b9296ee568720668b9678e2da5ad468b7 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:47:12 +0800 Subject: [PATCH 03/14] Missing changes --- ports/alac/vcpkg.json | 2 +- ports/box2d/portfile.cmake | 6 +++--- ports/box2d/vcpkg.json | 14 ++++++++++++-- ports/cmocka/portfile.cmake | 6 +++--- ports/cmocka/vcpkg.json | 14 ++++++++++++-- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/ports/alac/vcpkg.json b/ports/alac/vcpkg.json index c7fc36afd7389f..d9e252fff43d2d 100644 --- a/ports/alac/vcpkg.json +++ b/ports/alac/vcpkg.json @@ -1,7 +1,7 @@ { "name": "alac", "version-string": "2017-11-03-c38887c5", - "port-version": 2, + "port-version": 3, "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.", "homepage": "https://github.com/macosforge/alac", "supports": "!uwp", diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index c8e5c7f82f9ac2..7a40e4b96eddd0 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -9,17 +9,17 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBOX2D_BUILD_UNIT_TESTS=OFF -DBOX2D_BUILD_TESTBED=OFF ) vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/box2d) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/box2d/vcpkg.json b/ports/box2d/vcpkg.json index b1b4b140159e10..2abd22581504ed 100644 --- a/ports/box2d/vcpkg.json +++ b/ports/box2d/vcpkg.json @@ -1,8 +1,18 @@ { "name": "box2d", "version-semver": "2.4.1", - "port-version": 2, + "port-version": 3, "description": "An open source C++ engine for simulating rigid bodies in 2D", "homepage": "https://box2d.org", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake index 5da366763379db..658cc9823a3fe7 100644 --- a/ports/cmocka/portfile.cmake +++ b/ports/cmocka/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_gitlab( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_CMOCKERY_SUPPORT=ON -DUNIT_TESTING=OFF @@ -22,8 +22,8 @@ vcpkg_copy_pdbs() vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/cmocka/vcpkg.json b/ports/cmocka/vcpkg.json index 8978acdb42c3da..89e83af3c1a1f8 100644 --- a/ports/cmocka/vcpkg.json +++ b/ports/cmocka/vcpkg.json @@ -1,8 +1,18 @@ { "name": "cmocka", "version-string": "2020-08-01", - "port-version": 1, + "port-version": 2, "description": "An elegant unit testing framework for C with support for mock objects", "homepage": "https://cmocka.org/", - "license": "Apache-2.0" + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } From 50b2f0ba0fb5b2e91e1570ab108f65e92f86f771 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:47:33 +0800 Subject: [PATCH 04/14] version --- versions/a-/alac.json | 5 +++++ versions/b-/box2d.json | 5 +++++ versions/baseline.json | 6 +++--- versions/c-/cmocka.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/a-/alac.json b/versions/a-/alac.json index df4158718327be..043bc9fe16854c 100644 --- a/versions/a-/alac.json +++ b/versions/a-/alac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71902d13114760bafba205b06f2c7e0ff65a4974", + "version-string": "2017-11-03-c38887c5", + "port-version": 3 + }, { "git-tree": "4b325e9f42af74eca82fae2a845a5108b06b44ce", "version-string": "2017-11-03-c38887c5", diff --git a/versions/b-/box2d.json b/versions/b-/box2d.json index 408aa7cd35b223..224603d06a33f3 100644 --- a/versions/b-/box2d.json +++ b/versions/b-/box2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5f59a00193707b55defb442fbaa4a0f7b64b4c3", + "version-semver": "2.4.1", + "port-version": 3 + }, { "git-tree": "2c8a3a146971f33f497c21d6b52b756245f894e4", "version-semver": "2.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index bbde7c2508684e..eac5c7de1ef2b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -62,7 +62,7 @@ }, "alac": { "baseline": "2017-11-03-c38887c5", - "port-version": 2 + "port-version": 3 }, "alac-decoder": { "baseline": "0.2", @@ -1210,7 +1210,7 @@ }, "box2d": { "baseline": "2.4.1", - "port-version": 2 + "port-version": 3 }, "braft": { "baseline": "2021-26-04", @@ -1562,7 +1562,7 @@ }, "cmocka": { "baseline": "2020-08-01", - "port-version": 1 + "port-version": 2 }, "cnats": { "baseline": "3.6.0", diff --git a/versions/c-/cmocka.json b/versions/c-/cmocka.json index c1b208e9c499a1..9bef54ca5d7a57 100644 --- a/versions/c-/cmocka.json +++ b/versions/c-/cmocka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0e470330926987c13cc3e09df33ff20bc821c23", + "version-string": "2020-08-01", + "port-version": 2 + }, { "git-tree": "7b4b3515ae508de2f3eccb509948e8ed20eb877e", "version-string": "2020-08-01", From 0ee1f8b89c36102643f33b278a0740f7b120db72 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 16:14:04 +0800 Subject: [PATCH 05/14] typo --- ports/bigint/portfile.cmake | 2 +- ports/box2d/portfile.cmake | 2 +- ports/cctz/portfile.cmake | 2 +- ports/cello/portfile.cmake | 2 +- ports/cfitsio/portfile.cmake | 2 +- ports/clapack/portfile.cmake | 2 +- ports/cmcstl2/portfile.cmake | 2 +- ports/cmocka/portfile.cmake | 2 +- ports/cnl/portfile.cmake | 2 +- ports/coin/portfile.cmake | 2 +- ports/concurrentqueue/portfile.cmake | 2 +- ports/constexpr-contracts/portfile.cmake | 2 +- ports/coroutine/portfile.cmake | 2 +- ports/cpp-netlib/portfile.cmake | 4 ++-- ports/cppmicroservices/portfile.cmake | 2 +- ports/ctbignum/portfile.cmake | 2 +- ports/dbow2/portfile.cmake | 2 +- ports/debug-assert/portfile.cmake | 2 +- ports/discount/portfile.cmake | 2 +- ports/docopt/portfile.cmake | 2 +- ports/duktape/portfile.cmake | 2 +- ports/eabase/portfile.cmake | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake index 6c7e706094c022..3f11b7cedd0fca 100644 --- a/ports/bigint/portfile.cmake +++ b/ports/bigint/portfile.cmake @@ -20,6 +20,6 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake index 7a40e4b96eddd0..b7aca7a096a214 100644 --- a/ports/box2d/portfile.cmake +++ b/ports/box2d/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/box2d) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/box2d) vcpkg_copy_pdbs() diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index a5ce309f4e84ea..3c229e7c87b4eb 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-cctz) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cctz) vcpkg_copy_pdbs() diff --git a/ports/cello/portfile.cmake b/ports/cello/portfile.cmake index 9718c714ee0487..3e505b7b182816 100644 --- a/ports/cello/portfile.cmake +++ b/ports/cello/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index b447f90eae9cb0..31551941e3fb01 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-cfitsio) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cfitsio) file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake" ASSIMP_CONFIG) file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-cfitsio/unofficial-cfitsio-config.cmake" " diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index a5031fc63e8492..76458db0ac549b 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -55,7 +55,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() #TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now) -vcpkg_config_cmake_fixup(CONFIG_PATH share/clapack) +vcpkg_cmake_config_fixup(CONFIG_PATH share/clapack) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cmcstl2/portfile.cmake b/ports/cmcstl2/portfile.cmake index 2dbfb1fce5a0b7..cba78839cdfa3f 100644 --- a/ports/cmcstl2/portfile.cmake +++ b/ports/cmcstl2/portfile.cmake @@ -17,7 +17,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake index 658cc9823a3fe7..67105ce352d694 100644 --- a/ports/cmocka/portfile.cmake +++ b/ports/cmocka/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 6c19f14dd44119..7f5cdcad07842c 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index fa9ed41fb7aa23..c14bf027b00b33 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/Coin-4.0.0) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-4.0.0) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index cdfc72b9f2db42..f570594137b73a 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-concurrentqueue) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-concurrentqueue) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/constexpr-contracts/portfile.cmake b/ports/constexpr-contracts/portfile.cmake index 607fb5e5ce0be2..c1334bb6984a0a 100644 --- a/ports/constexpr-contracts/portfile.cmake +++ b/ports/constexpr-contracts/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/constexpr-contracts) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/constexpr-contracts) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index 896d053ed5d4d8..fb349a26c50634 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_cmake_configure( -DBUILD_TESTING=False ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake index 85a58b46571512..2e7fc78c541739 100644 --- a/ports/cpp-netlib/portfile.cmake +++ b/ports/cpp-netlib/portfile.cmake @@ -24,9 +24,9 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_config_cmake_fixup(CONFIG_PATH cmake PACKAGE_NAME cppnetlib) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME cppnetlib) else() - vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/cppnetlib PACKAGE_NAME cppnetlib) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cppnetlib PACKAGE_NAME cppnetlib) endif() file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 0d1acab61d625e..60a99f6a38a63d 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -22,7 +22,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ctbignum/portfile.cmake b/ports/ctbignum/portfile.cmake index 1bc187727b3bcd..6cc954a5bf0b80 100644 --- a/ports/ctbignum/portfile.cmake +++ b/ports/ctbignum/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Move CMake files to the right place -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # Remove empty files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/dbow2/portfile.cmake b/ports/dbow2/portfile.cmake index cd7427e1172454..5e6661e0416b71 100644 --- a/ports/dbow2/portfile.cmake +++ b/ports/dbow2/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Move CMake files to the right place -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/DBoW2) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DBoW2) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/DBoW2/DBoW2Config.cmake") diff --git a/ports/debug-assert/portfile.cmake b/ports/debug-assert/portfile.cmake index e32a2c8fb724cc..49da26ccbb6b1c 100644 --- a/ports/debug-assert/portfile.cmake +++ b/ports/debug-assert/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/debug_assert PACKAGE_NAME debug_assert) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/debug_assert PACKAGE_NAME debug_assert) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake index ed3cbd8d1233bf..a615b28e75c213 100644 --- a/ports/discount/portfile.cmake +++ b/ports/discount/portfile.cmake @@ -32,7 +32,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/discount) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/docopt/portfile.cmake b/ports/docopt/portfile.cmake index 835fd7da8dc29c..731938c9231630 100644 --- a/ports/docopt/portfile.cmake +++ b/ports/docopt/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/docopt) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/docopt) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index c12422456a3113..b00ec3466335b7 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -69,7 +69,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/eabase/portfile.cmake b/ports/eabase/portfile.cmake index b3363d875bd15a..7191eb44a70abc 100644 --- a/ports/eabase/portfile.cmake +++ b/ports/eabase/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/EABase) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EABase) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") From 6599b421b0740f7585a89c7b3b362d36d9d9c890 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 16:14:23 +0800 Subject: [PATCH 06/14] version --- versions/b-/bigint.json | 2 +- versions/b-/box2d.json | 2 +- versions/c-/cctz.json | 2 +- versions/c-/cello.json | 2 +- versions/c-/cfitsio.json | 2 +- versions/c-/clapack.json | 2 +- versions/c-/cmcstl2.json | 2 +- versions/c-/cmocka.json | 2 +- versions/c-/cnl.json | 2 +- versions/c-/coin.json | 2 +- versions/c-/concurrentqueue.json | 2 +- versions/c-/constexpr-contracts.json | 2 +- versions/c-/coroutine.json | 2 +- versions/c-/cpp-netlib.json | 2 +- versions/c-/cppmicroservices.json | 2 +- versions/c-/ctbignum.json | 2 +- versions/d-/dbow2.json | 2 +- versions/d-/debug-assert.json | 2 +- versions/d-/discount.json | 2 +- versions/d-/docopt.json | 2 +- versions/d-/duktape.json | 2 +- versions/e-/eabase.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/versions/b-/bigint.json b/versions/b-/bigint.json index 174075f53ed94b..0897a2f7cfb477 100644 --- a/versions/b-/bigint.json +++ b/versions/b-/bigint.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "08eead69719a039b1785cd2b5675a03f3162b9ad", + "git-tree": "60e99ba17607e7993bacfcec421b3b372acdefef", "version-string": "2010.04.30", "port-version": 8 }, diff --git a/versions/b-/box2d.json b/versions/b-/box2d.json index 224603d06a33f3..eabf2cf1a79c55 100644 --- a/versions/b-/box2d.json +++ b/versions/b-/box2d.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f5f59a00193707b55defb442fbaa4a0f7b64b4c3", + "git-tree": "bef68937d8b4101d0df330a399a7fc043f7ec5e5", "version-semver": "2.4.1", "port-version": 3 }, diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index 312ef77bd9d5e2..efd6b287814b83 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fd80df05059d180966bd338eae912c5972847981", + "git-tree": "d9230440e30edf443d69ac13244f53b6191742ae", "version-string": "2.3", "port-version": 4 }, diff --git a/versions/c-/cello.json b/versions/c-/cello.json index 0d76a213787e73..3cbcd9be8881b4 100644 --- a/versions/c-/cello.json +++ b/versions/c-/cello.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a529f8f5fcd96900023ead2ab9bbf3ccc4d81ed8", + "git-tree": "19194125360a0824e313a0d3a1f6d95154b6d2b7", "version-date": "2019-07-23", "port-version": 3 }, diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index a7dc9f47055759..8f2c49eaba327e 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0718def60f74b4a2126c4658ffc8e346a7145f6f", + "git-tree": "99900b13b6aebb6f189cf0842795997de74b610e", "version": "3.49", "port-version": 3 }, diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index eb16e61166f6cd..0dc2c8e24da23b 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4dddc8e8cd6bf3bfd4b99cb6d270f4255366c3af", + "git-tree": "5978f094d7e8c690994cabbae89918dd25881ae3", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/c-/cmcstl2.json b/versions/c-/cmcstl2.json index 6c5faecc4c151a..80c0917693804a 100644 --- a/versions/c-/cmcstl2.json +++ b/versions/c-/cmcstl2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "43898aa773df80a4310bf6e037191dcdd7916d56", + "git-tree": "71dc25003baa7f85cfb3924b553bf8642e7ea97e", "version-string": "2019-07-20", "port-version": 2 }, diff --git a/versions/c-/cmocka.json b/versions/c-/cmocka.json index 9bef54ca5d7a57..c463d336466a5c 100644 --- a/versions/c-/cmocka.json +++ b/versions/c-/cmocka.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c0e470330926987c13cc3e09df33ff20bc821c23", + "git-tree": "b9b3ab47324bb53d72b5868cd190fdae50a49d24", "version-string": "2020-08-01", "port-version": 2 }, diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index ac2734149e5975..586e01516e1331 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9c23cba13bb528c8b41719fd4c8031269044363f", + "git-tree": "f491a42c0680489de38159c7dd1486afc766c7fe", "version-string": "1.1.7", "port-version": 2 }, diff --git a/versions/c-/coin.json b/versions/c-/coin.json index e43c71dc741040..01a96feb124910 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5d9bd568013061a539276bd6b5d930b7ed5517ba", + "git-tree": "6a7f1c48f1f508f4935fc44a83645305ac5d6da4", "version-string": "4.0.0", "port-version": 6 }, diff --git a/versions/c-/concurrentqueue.json b/versions/c-/concurrentqueue.json index 7439bb2c9d1000..e17ada662fbbc5 100644 --- a/versions/c-/concurrentqueue.json +++ b/versions/c-/concurrentqueue.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cb04aeabcbe9b92bef661662137d0ef23cf3816f", + "git-tree": "2a8223a8b75af74f94551fb342fd576e893c1ba7", "version": "1.0.3", "port-version": 1 }, diff --git a/versions/c-/constexpr-contracts.json b/versions/c-/constexpr-contracts.json index 952a996f7d4651..fd33869dd0245c 100644 --- a/versions/c-/constexpr-contracts.json +++ b/versions/c-/constexpr-contracts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "50dd2e08491cb594c03341844a85b9be6a616a88", + "git-tree": "57c829c4a74272397d4901cf6ed525b2200e1d93", "version-string": "2020-08-09", "port-version": 2 }, diff --git a/versions/c-/coroutine.json b/versions/c-/coroutine.json index e2aa97ed3ee329..83ca5a81eef81e 100644 --- a/versions/c-/coroutine.json +++ b/versions/c-/coroutine.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "14c8577342a5f29b023637fc4fbb9ef899f19aa6", + "git-tree": "5cc8578b730599add7711992c556b5aefb835259", "version": "1.5.0", "port-version": 5 }, diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 56ad6ca9e749ab..1d759c535b145f 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5551fb5403cbfa681f247a42da7749863645baa3", + "git-tree": "a71758ba258596edd94871670c3d8f7cec334e37", "version-string": "0.13.0", "port-version": 7 }, diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 3ea9b0ad64b75b..ed5d72e5e7d5e0 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a1782099e7623d0a80dbea80f4c8850410571c57", + "git-tree": "4d97b6213a9f6a77e8f1062229ead80ffd4703a7", "version": "3.6.0", "port-version": 1 }, diff --git a/versions/c-/ctbignum.json b/versions/c-/ctbignum.json index 6aecc13cd0d815..0e0956074ed505 100644 --- a/versions/c-/ctbignum.json +++ b/versions/c-/ctbignum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8f459b6a4606fb1759bbe001fa29829eee62f031", + "git-tree": "1fcffc7d062c5cf53ad20df9303c577ab27aab59", "version-string": "2019-08-02", "port-version": 2 }, diff --git a/versions/d-/dbow2.json b/versions/d-/dbow2.json index e97e2ba35efcd9..b78b28f918898e 100644 --- a/versions/d-/dbow2.json +++ b/versions/d-/dbow2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "25afdb1d878ebef443f358c4a491b0ef1ced49c2", + "git-tree": "3494ca270396d5b2f8b496b5fc7b3043a8796069", "version-string": "2019-08-05", "port-version": 2 }, diff --git a/versions/d-/debug-assert.json b/versions/d-/debug-assert.json index 28529c8402f48e..559f18d7879a72 100644 --- a/versions/d-/debug-assert.json +++ b/versions/d-/debug-assert.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "521ac7e2f4eb66e08c88971256706658165b20aa", + "git-tree": "b41dd0f27f6eb99b63780eed36a9f3170acd60df", "version-string": "1.3.3", "port-version": 1 }, diff --git a/versions/d-/discount.json b/versions/d-/discount.json index 4df1ec19126492..87f7756a241074 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa7d3f040afd2f8ffdabc170fd5b89b9b30cc6e2", + "git-tree": "acdff2b22e0fc2351a96d099dedf2e4bbeb5ce9f", "version-string": "2.2.6", "port-version": 2 }, diff --git a/versions/d-/docopt.json b/versions/d-/docopt.json index 2e692905288f9a..11f1cab055299b 100644 --- a/versions/d-/docopt.json +++ b/versions/d-/docopt.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "533710de59acee31dbc82e4ac4c214e41b711678", + "git-tree": "9fe0c66a1eca6672184cb33b92ea744df0efc0b3", "version-string": "2018-11-01", "port-version": 2 }, diff --git a/versions/d-/duktape.json b/versions/d-/duktape.json index 2eb41c7728df96..fff51803390811 100644 --- a/versions/d-/duktape.json +++ b/versions/d-/duktape.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1b8814b8ff907c82c4a3ba254f45f67f8a84746", + "git-tree": "ec86279e8f26e8d5d45b3292d7bdf6750da9439f", "version-string": "2.5.0", "port-version": 3 }, diff --git a/versions/e-/eabase.json b/versions/e-/eabase.json index 13620bf787da4d..67370d65eca41c 100644 --- a/versions/e-/eabase.json +++ b/versions/e-/eabase.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "28f94fc47e3bb5b45856432705e69ad590d66664", + "git-tree": "71d9d1d988dad11e4eaa0cb39cc1a957a839308d", "version-string": "2.09.12", "port-version": 3 }, From db29407a1d162c896a8a48dd95f326bb25d45356 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 17:06:47 +0800 Subject: [PATCH 07/14] typo --- ports/ctbignum/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ctbignum/portfile.cmake b/ports/ctbignum/portfile.cmake index 6cc954a5bf0b80..1260fbfeaff0ea 100644 --- a/ports/ctbignum/portfile.cmake +++ b/ports/ctbignum/portfile.cmake @@ -22,5 +22,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION $"{CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 377a6caca931b1572de67ff457d4cbc80c7ba58a Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 17:06:56 +0800 Subject: [PATCH 08/14] version --- versions/c-/ctbignum.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/ctbignum.json b/versions/c-/ctbignum.json index 0e0956074ed505..5765ddf2e4f80d 100644 --- a/versions/c-/ctbignum.json +++ b/versions/c-/ctbignum.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fcffc7d062c5cf53ad20df9303c577ab27aab59", + "git-tree": "555cc4f7caade3a6d817fd65d15ff2274ed0f5eb", "version-string": "2019-08-02", "port-version": 2 }, From 26b1a8ffacb0cd40c7d600e770dae3604987465b Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 10:33:09 +0800 Subject: [PATCH 09/14] fix typo --- ports/aliyun-oss-c-sdk/portfile.cmake | 2 +- ports/cello/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/aliyun-oss-c-sdk/portfile.cmake b/ports/aliyun-oss-c-sdk/portfile.cmake index cdbad6aefc382c..a570cc2a004f8f 100644 --- a/ports/aliyun-oss-c-sdk/portfile.cmake +++ b/ports/aliyun-oss-c-sdk/portfile.cmake @@ -18,5 +18,5 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(REMOVE_RECURSE "{CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cello/portfile.cmake b/ports/cello/portfile.cmake index 3e505b7b182816..59a0497e5e3912 100644 --- a/ports/cello/portfile.cmake +++ b/ports/cello/portfile.cmake @@ -23,4 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file("{SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) From 5827bc00f45bafdfb154689a9bd0415b1c320a21 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 10:33:25 +0800 Subject: [PATCH 10/14] version --- versions/a-/aliyun-oss-c-sdk.json | 2 +- versions/c-/cello.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/a-/aliyun-oss-c-sdk.json b/versions/a-/aliyun-oss-c-sdk.json index daa8ae436b2a0d..195a46f4c53f2e 100644 --- a/versions/a-/aliyun-oss-c-sdk.json +++ b/versions/a-/aliyun-oss-c-sdk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e7723df9c199b9db1faf48a7d02c14bfe771c937", + "git-tree": "a05ad4fd2bde4c19dccdbfd66c18130e5bed7902", "version-string": "3.10.0", "port-version": 2 }, diff --git a/versions/c-/cello.json b/versions/c-/cello.json index 3cbcd9be8881b4..d9f7cb2ec7d6d8 100644 --- a/versions/c-/cello.json +++ b/versions/c-/cello.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "19194125360a0824e313a0d3a1f6d95154b6d2b7", + "git-tree": "999cf1c190507b8494ddff1188f613bd4b6616ce", "version-date": "2019-07-23", "port-version": 3 }, From 0a0c28adfbd96ea685680726e495c53535812024 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 10:32:46 +0800 Subject: [PATCH 11/14] deprecate vcpkg_extract_source_archive_ex --- ports/alac-decoder/portfile.cmake | 2 +- ports/behaviortree-cpp/portfile.cmake | 2 +- ports/berkeleydb/portfile.cmake | 2 +- ports/bigint/portfile.cmake | 2 +- ports/cfitsio/portfile.cmake | 2 +- ports/cgicc/portfile.cmake | 2 +- ports/clapack/portfile.cmake | 4 ++-- ports/discord-game-sdk/portfile.cmake | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake index 86d41c1f3fbb15..756aaa13cc4b41 100644 --- a/ports/alac-decoder/portfile.cmake +++ b/ports/alac-decoder/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index 7d0bbe68f8cce0..ee45c151899f99 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 cd3b15eb7c5bab68239b697da166220b4df8dd7e6cf5e831f316d411e24be56c9ed74e54a3e3dd332164d740159eaf9ce62d005601fd65133809dab29430c9b7 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake index 33e67243a5e5fa..f34e19a2f85f7a 100644 --- a/ports/berkeleydb/portfile.cmake +++ b/ports/berkeleydb/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-conflict-macro.patch diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake index 3f11b7cedd0fca..cf31de5c1f928d 100644 --- a/ports/bigint/portfile.cmake +++ b/ports/bigint/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 bb64380e51991f97a2489c04801ab4372f795b5e23870ad12d71087f1a2afba9b32f74dcdbdcb5228ebf0dd74a37185285bac7653dd3c62d6118d63c298689af ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-osx-usage.patch diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index 31551941e3fb01..30eae653319688 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake index 69176f3d47015a..36e738e740d9f5 100644 --- a/ports/cgicc/portfile.cmake +++ b/ports/cgicc/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 c361923cf3ac876bc3fc94dffd040d2be7cd44751d8534f4cfa3545e9f58a8ec35ebcd902a8ce6a19da0efe52db67506d8b02e5cc868188d187ce3092519abdf ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 76458db0ac549b..0f7e0c4b24e09e 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -10,9 +10,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES remove_internal_blas.patch fix-ConfigFile.patch diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index f2073cc3af4c8e..34b961ad2a418f 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 4c8f72c7bdf92bc969fb86b96ea0d835e01b9bab1a2cc27ae00bdac1b9733a1303ceadfe138c24a7609b76d61d49999a335dd596cf3f335d894702e2aa23406f ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL From 141a0ea6709fe4f568042fdc36b550439fe14b07 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 10:33:02 +0800 Subject: [PATCH 12/14] version --- versions/a-/alac-decoder.json | 2 +- versions/b-/behaviortree-cpp.json | 2 +- versions/b-/berkeleydb.json | 2 +- versions/b-/bigint.json | 2 +- versions/c-/cfitsio.json | 2 +- versions/c-/cgicc.json | 2 +- versions/c-/clapack.json | 2 +- versions/d-/discord-game-sdk.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json index aee654134bcc15..28a7b311e519ef 100644 --- a/versions/a-/alac-decoder.json +++ b/versions/a-/alac-decoder.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "35bb87b6ce7ee4d044c277ca3428c8745f8ebd84", + "git-tree": "479494653d10306d5a670e384ec197292ff46692", "version-string": "0.2", "port-version": 6 }, diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index c5e966d5b968e1..49d02cc7a77711 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "22329bcd29c8bc22d0c6c652c9ff3cc7af68fbe2", + "git-tree": "d1c69c98cc8f9f25a216600b8d4991149d106729", "version": "3.5.6", "port-version": 3 }, diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json index f0101edbd1075e..94899b8284170f 100644 --- a/versions/b-/berkeleydb.json +++ b/versions/b-/berkeleydb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bbf0b1ba091dbfa0c22f8750d83065ebe1eac28a", + "git-tree": "67374c2049744f016b2a2a1838e3c20a7e8d5a75", "version": "4.8.30", "port-version": 9 }, diff --git a/versions/b-/bigint.json b/versions/b-/bigint.json index 0897a2f7cfb477..29684411b4a76a 100644 --- a/versions/b-/bigint.json +++ b/versions/b-/bigint.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "60e99ba17607e7993bacfcec421b3b372acdefef", + "git-tree": "2599a3cda2c7d797b2ea4501c315614f9e2c5c0a", "version-string": "2010.04.30", "port-version": 8 }, diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index 8f2c49eaba327e..4d691ece5f5a1f 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "99900b13b6aebb6f189cf0842795997de74b610e", + "git-tree": "f827226dd84af116e82687c211cc5e359960eea0", "version": "3.49", "port-version": 3 }, diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json index a24a186ca0b758..ad921203028bc8 100644 --- a/versions/c-/cgicc.json +++ b/versions/c-/cgicc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a2ca742f8ab20fd25b69d948c22195e1d9b8dafb", + "git-tree": "ddf36adaddcb242524413ce6111ff704215e0623", "version-string": "3.2.19", "port-version": 6 }, diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 0dc2c8e24da23b..16e94266db7a78 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5978f094d7e8c690994cabbae89918dd25881ae3", + "git-tree": "871f5862865f2d57c1d06735e0b0187258218f70", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index 38579201e61b28..a400313f647b60 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a50927a8f85bc14dc750b3e212361d6d6e68598a", + "git-tree": "a21c0bf37789a9737b72461dab95a826b498984b", "version": "2.5.6", "port-version": 5 }, From 559bf4dc6667c48303d2b96c450bb4cc9dbdebe5 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 11:05:51 +0800 Subject: [PATCH 13/14] fix arguments --- ports/alac-decoder/portfile.cmake | 2 +- ports/behaviortree-cpp/portfile.cmake | 2 +- ports/berkeleydb/portfile.cmake | 2 +- ports/bigint/portfile.cmake | 2 +- ports/cfitsio/portfile.cmake | 2 +- ports/cgicc/portfile.cmake | 2 +- ports/clapack/portfile.cmake | 2 +- ports/discord-game-sdk/portfile.cmake | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake index 756aaa13cc4b41..877385ede05e34 100644 --- a/ports/alac-decoder/portfile.cmake +++ b/ports/alac-decoder/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES remove_stdint_headers.patch diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake index ee45c151899f99..7b77e10c52bd5f 100644 --- a/ports/behaviortree-cpp/portfile.cmake +++ b/ports/behaviortree-cpp/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES 001_port_fixes.patch diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake index f34e19a2f85f7a..48c93ae3055869 100644 --- a/ports/berkeleydb/portfile.cmake +++ b/ports/berkeleydb/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-conflict-macro.patch ) diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake index cf31de5c1f928d..d194219d8660ca 100644 --- a/ports/bigint/portfile.cmake +++ b/ports/bigint/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES fix-osx-usage.patch ) diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index 30eae653319688..13c3a183493eff 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES 0001-fix-dependencies.patch diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake index 36e738e740d9f5..f7d200fb34c461 100644 --- a/ports/cgicc/portfile.cmake +++ b/ports/cgicc/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-define.patch fix-static-build.patch diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 0f7e0c4b24e09e..e956275bf5fdb6 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES remove_internal_blas.patch diff --git a/ports/discord-game-sdk/portfile.cmake b/ports/discord-game-sdk/portfile.cmake index 34b961ad2a418f..c65e660c7faa2f 100644 --- a/ports/discord-game-sdk/portfile.cmake +++ b/ports/discord-game-sdk/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL PATCHES From d90714c2265cd061f46a2cb8e248f2d0584cad5a Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 11:05:59 +0800 Subject: [PATCH 14/14] version --- versions/a-/alac-decoder.json | 2 +- versions/b-/behaviortree-cpp.json | 2 +- versions/b-/berkeleydb.json | 2 +- versions/b-/bigint.json | 2 +- versions/c-/cfitsio.json | 2 +- versions/c-/cgicc.json | 2 +- versions/c-/clapack.json | 2 +- versions/d-/discord-game-sdk.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json index 28a7b311e519ef..8e444511f7032e 100644 --- a/versions/a-/alac-decoder.json +++ b/versions/a-/alac-decoder.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "479494653d10306d5a670e384ec197292ff46692", + "git-tree": "4b02da71863a4f88b910c23f05909e2cbb9ab9cc", "version-string": "0.2", "port-version": 6 }, diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index 49d02cc7a77711..bc7a1610b60ca4 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d1c69c98cc8f9f25a216600b8d4991149d106729", + "git-tree": "7518e59f9f1e994e3af289b8de87115834dcb758", "version": "3.5.6", "port-version": 3 }, diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json index 94899b8284170f..e60689fd333427 100644 --- a/versions/b-/berkeleydb.json +++ b/versions/b-/berkeleydb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "67374c2049744f016b2a2a1838e3c20a7e8d5a75", + "git-tree": "621db13f2d2f182412abec7e8e699cc57f9bf577", "version": "4.8.30", "port-version": 9 }, diff --git a/versions/b-/bigint.json b/versions/b-/bigint.json index 29684411b4a76a..d7a9507f9738fd 100644 --- a/versions/b-/bigint.json +++ b/versions/b-/bigint.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2599a3cda2c7d797b2ea4501c315614f9e2c5c0a", + "git-tree": "9b0dc5c03eb3f9da5fb625518dd2ab367df6aed8", "version-string": "2010.04.30", "port-version": 8 }, diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index 4d691ece5f5a1f..af756dc2b5737b 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f827226dd84af116e82687c211cc5e359960eea0", + "git-tree": "b3f1a4860fc51b43140dc7139dd262f93e4a949d", "version": "3.49", "port-version": 3 }, diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json index ad921203028bc8..e043b067305086 100644 --- a/versions/c-/cgicc.json +++ b/versions/c-/cgicc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ddf36adaddcb242524413ce6111ff704215e0623", + "git-tree": "e5359ace765633e6912eb2898e175f797c6b2d45", "version-string": "3.2.19", "port-version": 6 }, diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index 16e94266db7a78..3ae3ce28579fe6 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "871f5862865f2d57c1d06735e0b0187258218f70", + "git-tree": "f6f25a8699a34ca09b840a5e71b22ab8f6d01fda", "version": "3.2.1", "port-version": 21 }, diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index a400313f647b60..58f913b5695bb9 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a21c0bf37789a9737b72461dab95a826b498984b", + "git-tree": "87af266946b8e9b9f6ed5b439b3af5e185b84766", "version": "2.5.6", "port-version": 5 },