From 17b6a3cc0d1870afe27a8c0c8d05f8f216cfc39f Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:52:25 +0800 Subject: [PATCH 01/28] [many ports]switch to vcpkg-cmake / vckg-cmake-config --- ports/eathread/portfile.cmake | 17 +++-- ports/eathread/vcpkg.json | 12 +++- ports/ecos/portfile.cmake | 15 ++--- ports/ecos/vcpkg.json | 14 +++- ports/entityx/portfile.cmake | 12 ++-- ports/entityx/vcpkg.json | 14 +++- ports/fastfeat/portfile.cmake | 15 ++--- ports/fastfeat/vcpkg.json | 14 +++- ports/fastlz/portfile.cmake | 13 ++-- ports/fastlz/vcpkg.json | 13 +++- ports/fdlibm/portfile.cmake | 13 ++-- ports/fdlibm/vcpkg.json | 14 +++- ports/flashlight-cpu/portfile.cmake | 15 ++--- ports/flashlight-cpu/vcpkg.json | 12 +++- ports/flashlight-cuda/portfile.cmake | 15 ++--- ports/flashlight-cuda/vcpkg.json | 12 +++- ports/fmem/portfile.cmake | 11 ++-- ports/fmem/vcpkg.json | 14 +++- ports/foonathan-memory/portfile.cmake | 65 +++++++++---------- ports/foonathan-memory/vcpkg.json | 12 +++- ports/fp16/portfile.cmake | 11 ++-- ports/fp16/vcpkg.json | 11 +++- ports/freeopcua/portfile.cmake | 15 ++--- ports/freeopcua/vcpkg.json | 12 +++- ports/functions-framework-cpp/portfile.cmake | 17 +++-- ports/functions-framework-cpp/vcpkg.json | 12 +++- ports/fxdiv/portfile.cmake | 12 ++-- ports/fxdiv/vcpkg.json | 9 ++- ports/g2o/portfile.cmake | 19 +++--- ports/g2o/vcpkg.json | 12 +++- ports/gamma/portfile.cmake | 11 ++-- ports/gamma/vcpkg.json | 12 +++- ports/gasol/portfile.cmake | 10 +-- ports/gasol/vcpkg.json | 14 +++- ports/genann/portfile.cmake | 12 ++-- ports/genann/vcpkg.json | 14 +++- ports/gettimeofday/portfile.cmake | 9 ++- ports/gettimeofday/vcpkg.json | 14 +++- ports/gflags/portfile.cmake | 15 ++--- ports/gflags/vcpkg.json | 14 +++- ports/gl2ps/portfile.cmake | 11 ++-- ports/gl2ps/vcpkg.json | 10 ++- ports/gli/portfile.cmake | 17 +++-- ports/gli/vcpkg.json | 11 +++- ports/globjects/portfile.cmake | 15 ++--- ports/globjects/vcpkg.json | 12 +++- ports/gloo/portfile.cmake | 12 ++-- ports/gloo/vcpkg.json | 11 ++++ ports/glui/portfile.cmake | 19 +++--- ports/glui/vcpkg.json | 12 +++- ports/gmime/portfile.cmake | 23 ++++--- ports/gmime/vcpkg.json | 10 ++- ports/graphicsmagick/portfile.cmake | 27 ++++---- ports/graphicsmagick/vcpkg.json | 10 ++- ports/h5py-lzf/portfile.cmake | 15 ++--- ports/h5py-lzf/vcpkg.json | 12 +++- ports/hayai/portfile.cmake | 39 ++++++----- ports/hayai/vcpkg.json | 14 +++- ports/http-parser/portfile.cmake | 16 ++--- ports/http-parser/vcpkg.json | 14 +++- ports/hungarian/portfile.cmake | 17 +++-- ports/hungarian/vcpkg.json | 14 +++- .../vcpkg-port-config.cmake | 27 ++++---- ports/ignition-modularscripts/vcpkg.json | 14 +++- ports/iniparser/portfile.cmake | 19 +++--- ports/iniparser/vcpkg.json | 14 +++- ports/io2d/portfile.cmake | 17 +++-- ports/io2d/vcpkg.json | 10 ++- ports/itpp/portfile.cmake | 19 +++--- ports/itpp/vcpkg.json | 14 +++- ports/jbig2dec/portfile.cmake | 11 ++-- ports/jbig2dec/vcpkg.json | 14 +++- ports/jbigkit/portfile.cmake | 17 +++-- ports/jbigkit/vcpkg.json | 14 +++- ports/jinja2cpplight/portfile.cmake | 17 +++-- ports/jinja2cpplight/vcpkg.json | 10 ++- ports/json-spirit/portfile.cmake | 19 +++--- ports/json-spirit/vcpkg.json | 8 ++- ports/json11/portfile.cmake | 14 ++-- ports/json11/vcpkg.json | 14 +++- ports/json5-parser/portfile.cmake | 15 ++--- ports/json5-parser/vcpkg.json | 12 +++- ports/kd-soap/portfile.cmake | 24 +++---- ports/kd-soap/vcpkg.json | 10 ++- ports/kenlm/portfile.cmake | 13 ++-- ports/kenlm/vcpkg.json | 10 ++- ports/kuku/portfile.cmake | 13 ++-- ports/kuku/vcpkg.json | 14 +++- ports/kvasir-mpl/portfile.cmake | 16 ++--- ports/kvasir-mpl/vcpkg.json | 14 +++- ports/lapack/portfile.cmake | 4 +- ports/lapack/vcpkg.json | 9 +++ ports/levmar/portfile.cmake | 11 ++-- ports/levmar/vcpkg.json | 10 ++- ports/libaiff/portfile.cmake | 13 ++-- ports/libaiff/vcpkg.json | 10 ++- ports/libcds/portfile.cmake | 15 ++--- ports/libcds/vcpkg.json | 12 +++- ports/libconfig/portfile.cmake | 21 +++--- ports/libconfig/vcpkg.json | 14 +++- 100 files changed, 925 insertions(+), 525 deletions(-) diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index 421f7c591a7e01..d8c8926bd27b18 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -10,23 +10,22 @@ vcpkg_from_github( fix_cmake_install.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/EAThreadConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEATHREAD_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EAThread) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/EAThread) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/eathread") diff --git a/ports/eathread/vcpkg.json b/ports/eathread/vcpkg.json index 4f18b4c7a326a8..6960e3da4021da 100644 --- a/ports/eathread/vcpkg.json +++ b/ports/eathread/vcpkg.json @@ -1,12 +1,20 @@ { "name": "eathread", "version-string": "1.32.09", - "port-version": 3, + "port-version": 4, "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", "homepage": "https://github.com/electronicarts/EAThread", "supports": "!uwp & x64", "dependencies": [ "eabase", - "eastl" + "eastl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/ecos/portfile.cmake b/ports/ecos/portfile.cmake index 213d3266f5a37b..012f8b32e69936 100644 --- a/ports/ecos/portfile.cmake +++ b/ports/ecos/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF develop ) -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() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecos RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/ecos") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_config_cmake_fixup(CONFIG_PATH "share/ecos") \ No newline at end of file diff --git a/ports/ecos/vcpkg.json b/ports/ecos/vcpkg.json index a6e6dfbe0b517b..5d2c836b91b2b9 100644 --- a/ports/ecos/vcpkg.json +++ b/ports/ecos/vcpkg.json @@ -1,6 +1,16 @@ { "name": "ecos", "version-string": "2.0.8", - "port-version": 1, - "description": "A lightweight conic solver for second-order cone programming." + "port-version": 2, + "description": "A lightweight conic solver for second-order cone programming.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index d0f83eef4f08d3..2d77a8b2f17723 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -8,19 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false -DENTITYX_BUILD_SHARED=0 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/entityx) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/entityx/COPYING ${CURRENT_PACKAGES_DIR}/share/entityx/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/entityx" RENAME copyright) diff --git a/ports/entityx/vcpkg.json b/ports/entityx/vcpkg.json index 101eb1fa0b6cfa..1b88bd4823ed08 100644 --- a/ports/entityx/vcpkg.json +++ b/ports/entityx/vcpkg.json @@ -1,7 +1,17 @@ { "name": "entityx", "version-string": "1.3.0", - "port-version": 3, + "port-version": 4, "description": "EntityX - A fast, type-safe C++ Entity-Component system.", - "homepage": "https://github.com/alecthomas/entityx" + "homepage": "https://github.com/alecthomas/entityx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/fastfeat/portfile.cmake b/ports/fastfeat/portfile.cmake index 18ec525ca25e7d..d76f392e439b60 100644 --- a/ports/fastfeat/portfile.cmake +++ b/ports/fastfeat/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( file(COPY -${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/fastfeat.def -DESTINATION ${SOURCE_PATH} +"${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" +"${CMAKE_CURRENT_LIST_DIR}/fastfeat.def" +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() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fastfeat RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fastfeat" RENAME copyright) diff --git a/ports/fastfeat/vcpkg.json b/ports/fastfeat/vcpkg.json index 550c8b70822556..297757047bb8b8 100644 --- a/ports/fastfeat/vcpkg.json +++ b/ports/fastfeat/vcpkg.json @@ -1,6 +1,16 @@ { "name": "fastfeat", "version-string": "391d5e9", - "port-version": 2, - "description": "FAST feature detectors in C" + "port-version": 3, + "description": "FAST feature detectors in C", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index b9923d374d6d57..a5906f611f3fbb 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -8,16 +8,15 @@ 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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT} "RENAME copyright) diff --git a/ports/fastlz/vcpkg.json b/ports/fastlz/vcpkg.json index c27e1a60124250..654400dc734bd4 100644 --- a/ports/fastlz/vcpkg.json +++ b/ports/fastlz/vcpkg.json @@ -1,6 +1,17 @@ { "name": "fastlz", "version-date": "2021-05-10", + "port-version": 1, "description": "A lightning-fast lossless compression library", - "homepage": "https://github.com/ariya/FastLZ" + "homepage": "https://github.com/ariya/FastLZ", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/fdlibm/portfile.cmake b/ports/fdlibm/portfile.cmake index f822cef95bd944..0f673e9f2a8ed8 100644 --- a/ports/fdlibm/portfile.cmake +++ b/ports/fdlibm/portfile.cmake @@ -4,19 +4,18 @@ vcpkg_from_git( REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libm5.def" 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() # Handle copyright -configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY) +configure_file("${SOURCE_PATH}/NOTICE" "${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright" COPYONLY) diff --git a/ports/fdlibm/vcpkg.json b/ports/fdlibm/vcpkg.json index f90a637c991e71..16c102ae410672 100644 --- a/ports/fdlibm/vcpkg.json +++ b/ports/fdlibm/vcpkg.json @@ -1,6 +1,16 @@ { "name": "fdlibm", "version-string": "5.3", - "port-version": 5, - "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic" + "port-version": 6, + "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/flashlight-cpu/portfile.cmake b/ports/flashlight-cpu/portfile.cmake index cf4f1cdcc3a987..d17fa47c827d3c 100644 --- a/ports/flashlight-cpu/portfile.cmake +++ b/ports/flashlight-cpu/portfile.cmake @@ -35,20 +35,19 @@ vcpkg_check_features( ) # Build and install -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight" OPTIONS_RELEASE - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) +vcpkg_config_cmake_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -85,4 +84,4 @@ if (NUM_TOOLS GREATER 0) endif() # 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/flashlight-cpu/vcpkg.json b/ports/flashlight-cpu/vcpkg.json index 03ef5e957d6c11..6fd4b334281b69 100644 --- a/ports/flashlight-cpu/vcpkg.json +++ b/ports/flashlight-cpu/vcpkg.json @@ -1,11 +1,21 @@ { "name": "flashlight-cpu", "version": "0.3", - "port-version": 3, + "port-version": 4, "description": "A C++ standalone library for machine learning. CPU backend.", "homepage": "https://github.com/facebookresearch/flashlight", "license": "MIT", "supports": "!(windows | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "fl" ], diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 9935ea94eb1914..433825ab627df0 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -34,20 +34,19 @@ vcpkg_check_features( ) # Build and install -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight" OPTIONS_RELEASE - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight + "-DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) +vcpkg_config_cmake_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -84,4 +83,4 @@ if (NUM_TOOLS GREATER 0) endif() # 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/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index 0f0afd07551030..3dccbd2ba6aeb1 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,11 +1,21 @@ { "name": "flashlight-cuda", "version": "0.3", - "port-version": 4, + "port-version": 5, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "license": "MIT", "supports": "!(windows | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "fl" ], diff --git a/ports/fmem/portfile.cmake b/ports/fmem/portfile.cmake index 36e4e45f3bb41e..de0c0bb6d40f25 100644 --- a/ports/fmem/portfile.cmake +++ b/ports/fmem/portfile.cmake @@ -6,18 +6,17 @@ vcpkg_from_github( HEAD_REF master ) -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/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmem RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/fmem" RENAME copyright) diff --git a/ports/fmem/vcpkg.json b/ports/fmem/vcpkg.json index 17d54850a86e42..be236d006d87f2 100644 --- a/ports/fmem/vcpkg.json +++ b/ports/fmem/vcpkg.json @@ -1,6 +1,16 @@ { "name": "fmem", "version-string": "c-libs-2ccee3d2fb", - "port-version": 1, - "description": "A cross-platform library for opening memory-backed libc streams." + "port-version": 2, + "description": "A cross-platform library for opening memory-backed libc streams.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index 170eb43692f439..a30934696a5c48 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -18,27 +18,26 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${COMP_SOURCE_PATH}/comp_base.cmake DESTINATION ${SOURCE_PATH}/cmake/comp) +file(COPY "${COMP_SOURCE_PATH}/comp_base.cmake" DESTINATION "${SOURCE_PATH}/cmake/comp") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool FOONATHAN_MEMORY_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DFOONATHAN_MEMORY_BUILD_EXAMPLES=OFF -DFOONATHAN_MEMORY_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/foonathan_memory) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/foonathan_memory/cmake TARGET_PATH share/foonathan_memory) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_config_cmake_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake") + vcpkg_config_cmake_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) endif() vcpkg_copy_pdbs() @@ -46,26 +45,26 @@ vcpkg_copy_pdbs() # Place header files into the right folders # The original layout is not a problem for CMake-based project. file(COPY - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) file(GLOB COMP_INCLUDE_FILES - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp" ) file(COPY ${COMP_INCLUDE_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan + DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan" ) file(COPY - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include/foonathan/memory + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan/memory" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/foonathan_memory + "${CURRENT_PACKAGES_DIR}/include/foonathan_memory" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake + "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake" "\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory" "\${_IMPORT_PREFIX}/include" ) @@ -77,21 +76,21 @@ vcpkg_replace_string( # #define FOONATHAN_MEMORY_DEBUG_FILL 0 # We only have the Release version header files installed, however. vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp + "${CURRENT_PACKAGES_DIR}/include/foonathan/memory/detail/debug_helpers.hpp" "#if FOONATHAN_MEMORY_DEBUG_FILL" "#ifndef NDEBUG //#if FOONATHAN_MEMORY_DEBUG_FILL" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/LICENSE - ${CURRENT_PACKAGES_DIR}/debug/README.md - ${CURRENT_PACKAGES_DIR}/LICENSE - ${CURRENT_PACKAGES_DIR}/README.md + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README.md" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README.md" ) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR @@ -101,25 +100,25 @@ else() set(EXECUTABLE_SUFFIX "") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}") file(COPY - ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) else() file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX} + "${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/nodesize_dbg${EXECUTABLE_SUFFIX}" ) endif() endif() # 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/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json index e668bd94f54734..28f5f0b9385c2d 100644 --- a/ports/foonathan-memory/vcpkg.json +++ b/ports/foonathan-memory/vcpkg.json @@ -1,9 +1,19 @@ { "name": "foonathan-memory", "version-string": "2019-07-21", - "port-version": 2, + "port-version": 3, "description": "STL compatible C++ memory allocator library", "homepage": "https://foonathan.net/doc/memory/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "tool" ], diff --git a/ports/fp16/portfile.cmake b/ports/fp16/portfile.cmake index 101255b8b908bf..d292128e7841f6 100644 --- a/ports/fp16/portfile.cmake +++ b/ports/fp16/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( PATCHES find-psimd.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFP16_BUILD_TESTS=OFF -DFP16_BUILD_BENCHMARKS=OFF ) -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) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/fp16/vcpkg.json b/ports/fp16/vcpkg.json index 76eac902f7e055..793790140cabd0 100644 --- a/ports/fp16/vcpkg.json +++ b/ports/fp16/vcpkg.json @@ -1,9 +1,18 @@ { "name": "fp16", "version-date": "2021-02-21", + "port-version": 1, "description": "Header-only library for conversion to/from half-precision floating point formats", "homepage": "https://github.com/Maratyszcza/FP16", "dependencies": [ - "psimd" + "psimd", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake index 566c7a52744fe3..145ee1089d6e23 100644 --- a/ports/freeopcua/portfile.cmake +++ b/ports/freeopcua/portfile.cmake @@ -15,9 +15,8 @@ vcpkg_from_github( fix-std-headers.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PYTHON=OFF -DBUILD_TESTING=OFF @@ -25,12 +24,12 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") #Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freeopcua" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/freeopcua/vcpkg.json b/ports/freeopcua/vcpkg.json index 02da47e65d08bc..3f87489f82f434 100644 --- a/ports/freeopcua/vcpkg.json +++ b/ports/freeopcua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeopcua", "version-string": "20190125", - "port-version": 5, + "port-version": 6, "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.", "dependencies": [ "boost-asio", @@ -12,6 +12,14 @@ "boost-program-options", "boost-property-tree", "boost-system", - "boost-thread" + "boost-thread", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 89123d06a96060..919ff5b4d90e06 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -9,23 +9,22 @@ vcpkg_from_github( HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index 162cb6b8aa4806..c1e8658257a39d 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "functions-framework-cpp", "version": "1.1.0", - "port-version": 1, + "port-version": 2, "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", @@ -11,6 +11,14 @@ "boost-beast", "boost-program-options", "boost-serialization", - "nlohmann-json" + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/fxdiv/portfile.cmake b/ports/fxdiv/portfile.cmake index a62cefcd8e261d..06eaa4b7ec84c3 100644 --- a/ports/fxdiv/portfile.cmake +++ b/ports/fxdiv/portfile.cmake @@ -5,14 +5,14 @@ vcpkg_from_github( REF 63058eff77e11aa15bf531df5dd34395ec3017c8 SHA512 da33eab4d006645f383a1f24fc3e747db3aeb0613219297ec0ae69aa2617f07ba050ebd6a64a8cbde6d25481f176d0ec3b9753a95d1fbcead2136595f3e50e97 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFXDIV_BUILD_TESTS=OFF -DFXDIV_BUILD_BENCHMARKS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/fxdiv/vcpkg.json b/ports/fxdiv/vcpkg.json index e120815ee41831..eb8a9a44f29c96 100644 --- a/ports/fxdiv/vcpkg.json +++ b/ports/fxdiv/vcpkg.json @@ -1,6 +1,13 @@ { "name": "fxdiv", "version-string": "2021-02-21", + "port-version": 1, "description": "C99/C++ header-only library for division via fixed-point multiplication by inverse", - "homepage": "https://github.com/Maratyszcza/FXdiv" + "homepage": "https://github.com/Maratyszcza/FXdiv", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 010a10ccf255a1..133fc9db779d68 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -8,20 +8,19 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_LGPL_SHARED_LIBS=${BUILD_LGPL_SHARED_LIBS} -DG2O_BUILD_EXAMPLES=OFF -DG2O_BUILD_APPS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g2o) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/g2o) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*") @@ -32,12 +31,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endforeach() endif() -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") if(EXE OR DEBUG_EXE) file(REMOVE ${EXE} ${DEBUG_EXE}) endif() -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") -file(INSTALL ${SOURCE_PATH}/doc/license-bsd.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/doc/license-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index b81b5d65c9f8fc..fca1890656baaf 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,13 +1,21 @@ { "name": "g2o", "version-string": "2020-02-07", - "port-version": 2, + "port-version": 3, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "dependencies": [ "ceres", "eigen3", "lapack", - "suitesparse" + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gamma/portfile.cmake b/ports/gamma/portfile.cmake index 0437842d85219d..f004b443a79f9c 100644 --- a/ports/gamma/portfile.cmake +++ b/ports/gamma/portfile.cmake @@ -10,16 +10,15 @@ 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=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gamma/vcpkg.json b/ports/gamma/vcpkg.json index 3fcba5d20dc3ac..76118842c91940 100644 --- a/ports/gamma/vcpkg.json +++ b/ports/gamma/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gamma", "version-string": "gamma-2018-01-27", - "port-version": 4, + "port-version": 5, "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.", "homepage": "https://github.com/LancePutnam/Gamma", "license": "MIT", @@ -13,6 +13,14 @@ "external-libs" ] }, - "portaudio" + "portaudio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gasol/portfile.cmake b/ports/gasol/portfile.cmake index b535229653f7ec..25a61d45edf04d 100644 --- a/ports/gasol/portfile.cmake +++ b/ports/gasol/portfile.cmake @@ -11,13 +11,13 @@ vcpkg_from_github( fix-install.patch ) -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() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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/gasol/vcpkg.json b/ports/gasol/vcpkg.json index aa06ae3c218dfc..475f61c4fdea64 100644 --- a/ports/gasol/vcpkg.json +++ b/ports/gasol/vcpkg.json @@ -1,8 +1,18 @@ { "name": "gasol", "version-date": "2018-01-04", - "port-version": 2, + "port-version": 3, "description": "A general Genetic Algorithm Solver in C++", "homepage": "https://github.com/PytLab/GASol", - "supports": "!uwp & !arm" + "supports": "!uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/genann/portfile.cmake b/ports/genann/portfile.cmake index 56bcd4aeefc31b..8f83bc0c86cede 100644 --- a/ports/genann/portfile.cmake +++ b/ports/genann/portfile.cmake @@ -8,18 +8,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}" OPTIONS_RELEASE -DINSTALL_HEADERS=ON OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/genann) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/genann/LICENSE ${CURRENT_PACKAGES_DIR}/share/genann/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/genann/vcpkg.json b/ports/genann/vcpkg.json index 7e9de881533bc8..02ea4ef3f3b2c0 100644 --- a/ports/genann/vcpkg.json +++ b/ports/genann/vcpkg.json @@ -1,7 +1,17 @@ { "name": "genann", "version-string": "2019-07-10", - "port-version": 1, + "port-version": 2, "description": "Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C.", - "homepage": "https://github.com/codeplea/genann" + "homepage": "https://github.com/codeplea/genann", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/gettimeofday/portfile.cmake b/ports/gettimeofday/portfile.cmake index 0d08bacc8197f9..0b4d4b8158d109 100644 --- a/ports/gettimeofday/portfile.cmake +++ b/ports/gettimeofday/portfile.cmake @@ -1,9 +1,8 @@ -vcpkg_configure_cmake( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gettimeofday/vcpkg.json b/ports/gettimeofday/vcpkg.json index 9528e9a2c57b4b..00c724e026f57f 100644 --- a/ports/gettimeofday/vcpkg.json +++ b/ports/gettimeofday/vcpkg.json @@ -1,6 +1,16 @@ { "name": "gettimeofday", "version-string": "2017-10-14", - "port-version": 4, - "description": "An implementation of gettimeofday for WIN32" + "port-version": 5, + "description": "An implementation of gettimeofday for WIN32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index f1c22ff1aa6055..09e102ed41ac29 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -13,9 +13,8 @@ vcpkg_from_github( fix_cmake_config.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF @@ -24,15 +23,15 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gflags) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/gflags) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -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") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index 3b8d22a06ff163..50f8c15905d1f4 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,8 +1,18 @@ { "name": "gflags", "version-string": "2.2.2", - "port-version": 5, + "port-version": 6, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/gl2ps/portfile.cmake b/ports/gl2ps/portfile.cmake index d18d2fcb4ba401..2095809c3ccfa8 100644 --- a/ports/gl2ps/portfile.cmake +++ b/ports/gl2ps/portfile.cmake @@ -8,14 +8,13 @@ vcpkg_from_gitlab( PATCHES separate-static-dynamic-build.patch ) -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() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.GL2PS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/COPYING.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright.LGPL) +file(INSTALL "${SOURCE_PATH}/COPYING.GL2PS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright.LGPL) diff --git a/ports/gl2ps/vcpkg.json b/ports/gl2ps/vcpkg.json index 4230bc45cbd86a..f3603bc6265ca9 100644 --- a/ports/gl2ps/vcpkg.json +++ b/ports/gl2ps/vcpkg.json @@ -1,12 +1,20 @@ { "name": "gl2ps", "version-string": "1.4.2", - "port-version": 1, + "port-version": 2, "description": "OpenGL to PostScript Printing Library", "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps", "dependencies": [ "freeglut", "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index 5168aca1e5d738..fa775256f6d722 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -10,19 +10,18 @@ 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/gli) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/gli) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/gli/CMakeLists.txt") # Put the license file where vcpkg expects it # manual.md contains the "licenses" section for the project -file(INSTALL ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/manual.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/gli/vcpkg.json b/ports/gli/vcpkg.json index e1d746619608c9..1c9ba7bdd18a84 100644 --- a/ports/gli/vcpkg.json +++ b/ports/gli/vcpkg.json @@ -1,9 +1,18 @@ { "name": "gli", "version-date": "2021-07-06", + "port-version": 1, "description": "OpenGL Image (GLI)", "homepage": "https://gli.g-truc.net", "dependencies": [ - "glm" + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 4103fd3ab44e5e..7c9d93b44b9ab5 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -9,22 +9,21 @@ vcpkg_from_github( fix-dependency-glm.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF -DGIT_REV=0 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects) +vcpkg_config_cmake_fixup(CONFIG_PATH share/globjects/cmake/globjects) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(glm) find_dependency(glbinding) @@ -32,6 +31,6 @@ include(\${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake) ") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") vcpkg_copy_pdbs() diff --git a/ports/globjects/vcpkg.json b/ports/globjects/vcpkg.json index 8878d28659a741..2db70f03d519be 100644 --- a/ports/globjects/vcpkg.json +++ b/ports/globjects/vcpkg.json @@ -1,11 +1,19 @@ { "name": "globjects", "version-string": "1.1.0", - "port-version": 4, + "port-version": 5, "description": "C++ library strictly wrapping OpenGL objects", "homepage": "https://github.com/cginternals/globjects", "dependencies": [ "glbinding", - "glm" + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake index cc168af4a3ce59..f84aba27e0de71 100644 --- a/ports/gloo/portfile.cmake +++ b/ports/gloo/portfile.cmake @@ -18,15 +18,15 @@ if ("cuda" IN_LIST FEATURES) list(APPEND GLOO_FEATURE_OPTIONS "-DUSE_CUDA=1" "-DUSE_NCCL=1") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${GLOO_FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Gloo) +vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/Gloo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/gloo/vcpkg.json b/ports/gloo/vcpkg.json index 15c4593c1d3c43..2a48f62fcb3206 100644 --- a/ports/gloo/vcpkg.json +++ b/ports/gloo/vcpkg.json @@ -1,9 +1,20 @@ { "name": "gloo", "version-string": "20201203", + "port-version": 1, "description": "Collective communications library with various primitives for multi-machine training.", "homepage": "https://github.com/facebookincubator/gloo", "supports": "x64 & linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "cuda": { "description": "for CUDA aware algorithms", diff --git a/ports/glui/portfile.cmake b/ports/glui/portfile.cmake index a3b37a597141b3..e0c19a6a48d1e9 100644 --- a/ports/glui/portfile.cmake +++ b/ports/glui/portfile.cmake @@ -8,30 +8,29 @@ vcpkg_from_github( install-one-flavor.patch ) -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 lib/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/${PORT}) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/GL/glui.h + "${CURRENT_PACKAGES_DIR}/include/GL/glui.h" "ifdef GLUIDLL" "if 1 //ifdef GLUIDLL" ) endif() -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/glui/vcpkg.json b/ports/glui/vcpkg.json index c585a4f2bfbc88..33921040bf526e 100644 --- a/ports/glui/vcpkg.json +++ b/ports/glui/vcpkg.json @@ -1,10 +1,18 @@ { "name": "glui", "version-string": "2019-11-30", - "port-version": 1, + "port-version": 2, "description": "GLUI is a GLUT-based C++ user interface library", "homepage": "https://github.com/libglui/glui", "dependencies": [ - "freeglut" + "freeglut", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index d1e145a8381afa..41ff3b5d343289 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -11,29 +11,28 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" REF ${LIB_VERSION} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") # We can use file supplied with original sources -configure_file(${SOURCE_PATH}/build/vs2017/unistd.h ${SOURCE_PATH} COPYONLY) -configure_file(${SOURCE_PATH}/build/vs2017/config.h ${SOURCE_PATH} COPYONLY) -configure_file(${SOURCE_PATH}/build/vs2017/gmime.def ${SOURCE_PATH} COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/unistd.h" "${SOURCE_PATH}" COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/config.h" "${SOURCE_PATH}" COPYONLY) +configure_file("${SOURCE_PATH}/build/vs2017/gmime.def" "${SOURCE_PATH}" COPYONLY) vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # License and man -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${LIB_NAME}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/gmime/vcpkg.json b/ports/gmime/vcpkg.json index 527bf5659b316d..980129e0e7b702 100644 --- a/ports/gmime/vcpkg.json +++ b/ports/gmime/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmime", "version": "3.2.6", - "port-version": 3, + "port-version": 4, "description": "GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).", "homepage": "https://developer.gnome.org/gmime/", "license": "LGPL-2.1-or-later", @@ -10,6 +10,14 @@ "glib", "libiconv", "libidn2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 142364ea9dbd32..ef74a2975a0a9f 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -17,31 +17,30 @@ vcpkg_from_sourceforge( disable_graphicsmagick_modules.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/magick_types.h DESTINATION ${SOURCE_PATH}/magick) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/magick_types.h" DESTINATION "${SOURCE_PATH}/magick") -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() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick) +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-graphicsmagick) # copy license -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # copy config -file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) -file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) -file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config) +file(COPY "${SOURCE_PATH}/config/colors.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") +file(COPY "${SOURCE_PATH}/config/log.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") +file(COPY "${SOURCE_PATH}/config/modules.mgk" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/config") -file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK) +file(READ "${SOURCE_PATH}/config/type-windows.mgk.in" TYPE_MGK) string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk" "${TYPE_MGK}") -configure_file(${SOURCE_PATH}/config/delegates.mgk.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk @ONLY) +configure_file("${SOURCE_PATH}/config/delegates.mgk.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/config/delegates.mgk" @ONLY) vcpkg_copy_pdbs() diff --git a/ports/graphicsmagick/vcpkg.json b/ports/graphicsmagick/vcpkg.json index e343f1eb45924c..07ccdcf8f07b69 100644 --- a/ports/graphicsmagick/vcpkg.json +++ b/ports/graphicsmagick/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphicsmagick", "version": "1.3.37", - "port-version": 1, + "port-version": 2, "description": "Image processing library", "homepage": "https://sourceforge.net/projects/graphicsmagick/", "dependencies": [ @@ -11,6 +11,14 @@ "libpng", "libwebp", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/h5py-lzf/portfile.cmake b/ports/h5py-lzf/portfile.cmake index 71b4709b8627ff..f3edfb8cf8441c 100644 --- a/ports/h5py-lzf/portfile.cmake +++ b/ports/h5py-lzf/portfile.cmake @@ -16,19 +16,18 @@ vcpkg_from_github( 0001-disable-H5PLget_plugin-api.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lzf) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/lzf") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/lzf - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lzf" OPTIONS -Dlink_hdf5_SHARED=${link_hdf5_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/lzf/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/lzf/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/h5py-lzf/vcpkg.json b/ports/h5py-lzf/vcpkg.json index eb203ee5fdd13c..ec1940ff45a4ec 100644 --- a/ports/h5py-lzf/vcpkg.json +++ b/ports/h5py-lzf/vcpkg.json @@ -1,10 +1,18 @@ { "name": "h5py-lzf", "version-string": "2019-12-04", - "port-version": 1, + "port-version": 2, "description": "The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann.", "homepage": "https://github.com/h5py/h5py/tree/master/lzf", "dependencies": [ - "hdf5" + "hdf5", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/hayai/portfile.cmake b/ports/hayai/portfile.cmake index 4fa698d18f9a71..93e9b27d1d3ca4 100644 --- a/ports/hayai/portfile.cmake +++ b/ports/hayai/portfile.cmake @@ -13,53 +13,52 @@ if(VCPKG_TARGET_IS_UWP) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DINSTALL_HAYAI=ON -DBUILD_HAYAI_TESTS=OFF -DBUILD_HAYAI_SAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_config_cmake_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}") + vcpkg_config_cmake_fixup(CONFIG_PATH lib/CMake/${PORT}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle manual-link libraries -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib + "${CURRENT_PACKAGES_DIR}/debug/lib/hayai_main.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/hayai_main.lib" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake + "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-debug.cmake" "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/hayai_main.lib" "\${CMAKE_CURRENT_LIST_DIR}/../../debug/lib/manual-link/hayai_main.lib" ) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib - ${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib + "${CURRENT_PACKAGES_DIR}/lib/hayai_main.lib" + "${CURRENT_PACKAGES_DIR}/lib/manual-link/hayai_main.lib" ) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake + "${CURRENT_PACKAGES_DIR}/share/${PORT}/hayai-targets-release.cmake" "\${CMAKE_CURRENT_LIST_DIR}/../../lib/hayai_main.lib" "\${CMAKE_CURRENT_LIST_DIR}/../../lib/manual-link/hayai_main.lib" ) endif() # 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/hayai/vcpkg.json b/ports/hayai/vcpkg.json index 847c0d2fc1d704..3efb29191fb960 100644 --- a/ports/hayai/vcpkg.json +++ b/ports/hayai/vcpkg.json @@ -1,7 +1,17 @@ { "name": "hayai", "version-string": "2019-08-10", - "port-version": 1, + "port-version": 2, "description": "C++ benchmarking framework", - "homepage": "https://github.com/nickbruun/hayai" + "homepage": "https://github.com/nickbruun/hayai", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index 9aa59177357e4d..64c338a8cbc93d 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -8,19 +8,17 @@ 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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-http-parser TARGET_PATH share/unofficial-http-parser) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-http-parser) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/http-parser) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/http-parser/LICENSE-MIT ${CURRENT_PACKAGES_DIR}/share/http-parser/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/${PORT}" RENAME copyright) diff --git a/ports/http-parser/vcpkg.json b/ports/http-parser/vcpkg.json index bd316b2a24a0ea..1c64f98f7f625f 100644 --- a/ports/http-parser/vcpkg.json +++ b/ports/http-parser/vcpkg.json @@ -1,7 +1,17 @@ { "name": "http-parser", "version-string": "2.9.4", - "port-version": 1, + "port-version": 2, "description": "HTTP Parser.", - "homepage": "https://github.com/nodejs/http-parser" + "homepage": "https://github.com/nodejs/http-parser", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index dc02cdb2eb7e48..29e2741329b052 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/portfile.cmake @@ -8,22 +8,21 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -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() +vcpkg_config_cmake_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/hungarian RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hungarian/vcpkg.json b/ports/hungarian/vcpkg.json index 3d74f6cde35d7b..9734e8cb156f44 100644 --- a/ports/hungarian/vcpkg.json +++ b/ports/hungarian/vcpkg.json @@ -1,6 +1,16 @@ { "name": "hungarian", "version-string": "v0.1.3", - "port-version": 1, - "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase" + "port-version": 2, + "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 7737281d475458..5a30e876a3f480 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -5,29 +5,28 @@ function(ignition_modular_build_library) set(multiValueArgs OPTIONS) cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) vcpkg_find_acquire_program(PKGCONFIG) - vcpkg_configure_cmake( - SOURCE_PATH ${IML_SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${IML_SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DBUILD_TESTING=OFF ${IML_OPTIONS} ) - vcpkg_install_cmake(ADD_BIN_TO_PATH) + vcpkg_cmake_install(ADD_BIN_TO_PATH) # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") # Some ignition libraries install library subcomponents, that are effectively additional cmake packages - # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well + # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_config_cmake_fixup for them as well file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES LIST_DIRECTORIES TRUE RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" "${CURRENT_PACKAGES_DIR}/lib/cmake/*") foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" + vcpkg_config_cmake_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() @@ -40,10 +39,10 @@ function(ignition_modular_build_library) endif() # Remove unused files files - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") # Make pkg-config files relocatable if(NOT IML_DISABLE_PKGCONFIG_INSTALL) @@ -52,8 +51,8 @@ function(ignition_modular_build_library) endif() vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES}) else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(REMOVE_RECURSE "{CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "{CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() # Find the relevant license file and install it @@ -62,7 +61,7 @@ function(ignition_modular_build_library) elseif(EXISTS "${SOURCE_PATH}/README.md") set(LICENSE_PATH "${SOURCE_PATH}/README.md") endif() - file(INSTALL ${LICENSE_PATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endfunction() ## # ignition_modular_library diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json index d7beaa13ff731f..ef7fdd97ad0450 100644 --- a/ports/ignition-modularscripts/vcpkg.json +++ b/ports/ignition-modularscripts/vcpkg.json @@ -1,7 +1,17 @@ { "name": "ignition-modularscripts", "version-date": "2022-05-11", - "port-version": 1, + "port-version": 2, "description": "Vcpkg helpers to package ignition libraries", - "license": null + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/iniparser/portfile.cmake b/ports/iniparser/portfile.cmake index 30487f815b7648..ba7ec73534a8d1 100644 --- a/ports/iniparser/portfile.cmake +++ b/ports/iniparser/portfile.cmake @@ -10,19 +10,18 @@ vcpkg_from_github( win32_ssize_t.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}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json index e4b515cbfc374b..431ffd2721bc7b 100644 --- a/ports/iniparser/vcpkg.json +++ b/ports/iniparser/vcpkg.json @@ -1,8 +1,18 @@ { "name": "iniparser", "version-date": "2020-04-06", - "port-version": 3, + "port-version": 4, "description": "C library for parsing INI-style files", "homepage": "https://github.com/ndevilla/iniparser", - "license": "MIT" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index d47fc97c854164..29931fa41513f5 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -14,9 +14,8 @@ if (VCPKG_TARGET_IS_OSX) set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DIO2D_WITHOUT_SAMPLES=1 -DIO2D_WITHOUT_TESTS=1 @@ -24,15 +23,15 @@ vcpkg_configure_cmake( ${IO2D_DEFAULT_OPTION} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/io2d) if (NOT VCPKG_TARGET_IS_OSX) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) - file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " + file(RENAME "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" " include(CMakeFindDependencyMacro) find_dependency(unofficial-cairo CONFIG) find_dependency(unofficial-graphicsmagick CONFIG) @@ -41,4 +40,4 @@ if (NOT VCPKG_TARGET_IS_OSX) ") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/io2d/vcpkg.json b/ports/io2d/vcpkg.json index 79570f44ba0115..cc6034ac194921 100644 --- a/ports/io2d/vcpkg.json +++ b/ports/io2d/vcpkg.json @@ -1,7 +1,7 @@ { "name": "io2d", "version-date": "2020-09-14", - "port-version": 3, + "port-version": 4, "description": "a lightweight, cross platform drawing library", "dependencies": [ { @@ -18,6 +18,14 @@ { "name": "graphicsmagick", "platform": "!osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 696f333824e9d2..db2ee89546a38b 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -14,25 +14,24 @@ vcpkg_from_sourceforge( ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() 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}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index 972f0cd1998219..9754e0ad1bb49d 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,17 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 8, + "port-version": 9, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", - "homepage": "http://itpp.sourceforge.net" + "homepage": "http://itpp.sourceforge.net", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake index 099252b202337a..463c3920811232 100644 --- a/ports/jbig2dec/portfile.cmake +++ b/ports/jbig2dec/portfile.cmake @@ -8,16 +8,15 @@ 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=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbig2dec RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jbig2dec/vcpkg.json b/ports/jbig2dec/vcpkg.json index a4f145f69ccc47..4eca7af132dc2b 100644 --- a/ports/jbig2dec/vcpkg.json +++ b/ports/jbig2dec/vcpkg.json @@ -1,7 +1,17 @@ { "name": "jbig2dec", "version-string": "0.19", - "port-version": 1, + "port-version": 2, "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.", - "homepage": "https://github.com/ArtifexSoftware/jbig2dec" + "homepage": "https://github.com/ArtifexSoftware/jbig2dec", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index ba2d6555a08322..49f6f243c59d8d 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -10,20 +10,19 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH ) -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() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jbigkit) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jbigkit/COPYING ${CURRENT_PACKAGES_DIR}/share/jbigkit/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jbigkit/vcpkg.json b/ports/jbigkit/vcpkg.json index 1498be4fa7fc92..2282c2b3f7b4c7 100644 --- a/ports/jbigkit/vcpkg.json +++ b/ports/jbigkit/vcpkg.json @@ -1,7 +1,17 @@ { "name": "jbigkit", "version-string": "2.1", - "port-version": 5, + "port-version": 6, "description": "A software implementation of the JBIG1 data compression standard (ITU-T T.82)", - "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit" + "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/jinja2cpplight/portfile.cmake b/ports/jinja2cpplight/portfile.cmake index 329020de2c1f02..7f6554ab08ae46 100644 --- a/ports/jinja2cpplight/portfile.cmake +++ b/ports/jinja2cpplight/portfile.cmake @@ -17,21 +17,20 @@ 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() vcpkg_copy_pdbs() -file(GLOB_RECURSE JINJA2CPPLIGHT_EXES ${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*) -file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(GLOB_RECURSE JINJA2CPPLIGHT_EXES "${CURRENT_PACKAGES_DIR}/bin/jinja2cpplight_unittests*") +file(COPY ${JINJA2CPPLIGHT_EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools") file(REMOVE_RECURSE ${JINJA2CPPLIGHT_EXES}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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/jinja2cpplight/vcpkg.json b/ports/jinja2cpplight/vcpkg.json index 004282a82947ed..6d3b208ff7a577 100644 --- a/ports/jinja2cpplight/vcpkg.json +++ b/ports/jinja2cpplight/vcpkg.json @@ -1,8 +1,14 @@ { "name": "jinja2cpplight", "version-string": "2018-05-08", - "port-version": 1, + "port-version": 2, "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.", "homepage": "https://github.com/hughperkins/Jinja2CppLight", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/json-spirit/portfile.cmake b/ports/json-spirit/portfile.cmake index 658cb92a4fe5b6..937e2b9f4714bd 100644 --- a/ports/json-spirit/portfile.cmake +++ b/ports/json-spirit/portfile.cmake @@ -9,17 +9,20 @@ vcpkg_from_github( Fix-link-error-C1128.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_STATIC_LIBS=off -DJSON_SPIRIT_DEMOS=off -DJSON_SPIRIT_TESTS=off) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_STATIC_LIBS=OFF + -DJSON_SPIRIT_DEMOS=OFF + -DJSON_SPIRIT_TESTS=OFF +) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json-spirit RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() diff --git a/ports/json-spirit/vcpkg.json b/ports/json-spirit/vcpkg.json index 35517305eca6bd..cbb424fdd5a0b3 100644 --- a/ports/json-spirit/vcpkg.json +++ b/ports/json-spirit/vcpkg.json @@ -1,13 +1,17 @@ { "name": "json-spirit", "version-string": "4.1.0", - "port-version": 2, + "port-version": 3, "description": "json parser using boost library", "dependencies": [ "boost-config", "boost-integer", "boost-smart-ptr", "boost-spirit", - "boost-variant" + "boost-variant", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake index 3ff8b0f2951b1e..fa87e5b209a167 100644 --- a/ports/json11/portfile.cmake +++ b/ports/json11/portfile.cmake @@ -9,22 +9,20 @@ vcpkg_from_github( PATCHES destination.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJSON11_BUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CURRENT_PORT_DIR}/json11-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) +file(INSTALL "${CURRENT_PORT_DIR}/json11-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/json11/vcpkg.json b/ports/json11/vcpkg.json index 70fb4f20971d4c..4e021da25bca46 100644 --- a/ports/json11/vcpkg.json +++ b/ports/json11/vcpkg.json @@ -1,6 +1,16 @@ { "name": "json11", "version-string": "2017-06-20", - "port-version": 4, - "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization." + "port-version": 5, + "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/json5-parser/portfile.cmake b/ports/json5-parser/portfile.cmake index 79e4d1afc6895b..79b14c417a61ca 100644 --- a/ports/json5-parser/portfile.cmake +++ b/ports/json5-parser/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_github( PATCHES 00001-fix-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/json5_parser - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/json5_parser" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/json5-parser) +vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/json5-parser) -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") -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/json5-parser/vcpkg.json b/ports/json5-parser/vcpkg.json index 13c1e6bb3568de..f40c261592166a 100644 --- a/ports/json5-parser/vcpkg.json +++ b/ports/json5-parser/vcpkg.json @@ -1,10 +1,18 @@ { "name": "json5-parser", "version-string": "1.0.0", - "port-version": 3, + "port-version": 4, "description": "An enhancement of the JSON Spirit C++ library to understand json5.", "homepage": "https://github.com/Caltech-IPAC/json5_parser", "dependencies": [ - "boost-spirit" + "boost-spirit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 03f99fab8ba454..6976905323f66e 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -8,25 +8,25 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKDSoap_STATIC=${KDSoap_STATIC} -DKDSoap_EXAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KDSoap TARGET_PATH share/KDSoap) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/KDSoap PACKAGE_NAME KDSoap) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}") 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}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kd-soap/vcpkg.json b/ports/kd-soap/vcpkg.json index 3cd11e0e42b4c7..5f4b6a26b6d2bf 100644 --- a/ports/kd-soap/vcpkg.json +++ b/ports/kd-soap/vcpkg.json @@ -1,13 +1,21 @@ { "name": "kd-soap", "version-string": "1.9.0", - "port-version": 1, + "port-version": 2, "description": "A Qt-based client-side and server-side SOAP component", "homepage": "https://www.kdab.com/products/kd-soap", "dependencies": [ { "name": "qt5-base", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/kenlm/portfile.cmake b/ports/kenlm/portfile.cmake index ad0c5c6c9408c0..bd5f5033e6e7ab 100644 --- a/ports/kenlm/portfile.cmake +++ b/ports/kenlm/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( fix-const-overloaded.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindEigen3.cmake) +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS interpolate ENABLE_INTERPOLATE @@ -21,16 +21,15 @@ if ("interpolate" IN_LIST FEATURES AND VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "The interpolate feature does not support Windows.") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DFORCE_STATIC=OFF #already handled by vcpkg -DENABLE_PYTHON=OFF # kenlm.lib(bhiksha.cc.obj) : fatal error LNK1000: Internal error during IMAGE::Pass2 -DCOMPILE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary) if (NOT VCPKG_TARGET_IS_WINDOWS) @@ -46,5 +45,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Copyright and License -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME license) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME license) diff --git a/ports/kenlm/vcpkg.json b/ports/kenlm/vcpkg.json index 66c218ad92c24e..5eefa904c113e4 100644 --- a/ports/kenlm/vcpkg.json +++ b/ports/kenlm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kenlm", "version-string": "20200924", - "port-version": 1, + "port-version": 2, "description": "KenLM: Faster and Smaller Language Model Queries", "supports": "!(arm64 & windows)", "dependencies": [ @@ -17,6 +17,14 @@ "platform": "!windows" }, "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake index 98ff18775720b8..49bab6a6e32ada 100644 --- a/ports/kuku/portfile.cmake +++ b/ports/kuku/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Kuku-2.1) +vcpkg_cmake_install() +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/Kuku-2.1) -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/kuku/vcpkg.json b/ports/kuku/vcpkg.json index 2f7b13515cefff..384a5e5fb610b8 100644 --- a/ports/kuku/vcpkg.json +++ b/ports/kuku/vcpkg.json @@ -1,7 +1,17 @@ { "name": "kuku", "version-string": "2.1", - "port-version": 1, + "port-version": 2, "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.", - "homepage": "https://github.com/microsoft/Kuku" + "homepage": "https://github.com/microsoft/Kuku", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/kvasir-mpl/portfile.cmake b/ports/kvasir-mpl/portfile.cmake index 7208bcc8adb57d..04c02e21960277 100644 --- a/ports/kvasir-mpl/portfile.cmake +++ b/ports/kvasir-mpl/portfile.cmake @@ -10,20 +10,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS test BUILD_WITH_TEST ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=${BUILD_WITH_TEST} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kvasir_mpl) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/kvasir_mpl) -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.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/kvasir-mpl/vcpkg.json b/ports/kvasir-mpl/vcpkg.json index 4d817575a72cb9..fe8942adeeca30 100644 --- a/ports/kvasir-mpl/vcpkg.json +++ b/ports/kvasir-mpl/vcpkg.json @@ -1,12 +1,22 @@ { "name": "kvasir-mpl", "version-string": "2019-08-06", - "port-version": 1, + "port-version": 2, "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.", "homepage": "https://github.com/kvasir-io/mpl", "features": { "test": { "description": "Build with test" } - } + }, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/lapack/portfile.cmake b/ports/lapack/portfile.cmake index 2a59fa7267d7c2..ea9381244793a8 100644 --- a/ports/lapack/portfile.cmake +++ b/ports/lapack/portfile.cmake @@ -1,5 +1,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) # Make sure LAPACK can be found -vcpkg_configure_cmake(SOURCE_PATH ${CURRENT_PORT_DIR} - OPTIONS -DCMAKE_PREFIX_PATH="${CURRENT_PACKAGES_DIR}") +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}" + OPTIONS "-DCMAKE_PREFIX_PATH=${CURRENT_PACKAGES_DIR}") diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json index 70a2aabec304fe..02a3ff62688def 100644 --- a/ports/lapack/vcpkg.json +++ b/ports/lapack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lapack", "version-date": "2022-02-22", + "port-version": 1, "description": "Metapackage for packages which provide LAPACK", "license": null, "dependencies": [ @@ -11,6 +12,14 @@ { "name": "lapack-reference", "platform": "!((arm & windows) | uwp)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/levmar/portfile.cmake b/ports/levmar/portfile.cmake index 1ed0ad75d57292..e2b2c7c757ddcb 100644 --- a/ports/levmar/portfile.cmake +++ b/ports/levmar/portfile.cmake @@ -6,13 +6,12 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DHAVE_LAPACK=OFF @@ -20,10 +19,10 @@ vcpkg_configure_cmake( -DBUILD_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # 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) # Handle duplicated debug includes file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/levmar/vcpkg.json b/ports/levmar/vcpkg.json index a72eb4b3f46f2d..55cf4dca19b329 100644 --- a/ports/levmar/vcpkg.json +++ b/ports/levmar/vcpkg.json @@ -1,8 +1,14 @@ { "name": "levmar", "version": "2.6", - "port-version": 1, + "port-version": 2, "description": "Levenberg-Marquardt nonlinear least squares optimization algorithm", "homepage": "http://users.ics.forth.gr/~lourakis/levmar/", - "supports": "windows & !uwp" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libaiff/portfile.cmake b/ports/libaiff/portfile.cmake index 97d8673b6b4f97..38c799e4ce0538 100644 --- a/ports/libaiff/portfile.cmake +++ b/ports/libaiff/portfile.cmake @@ -11,17 +11,16 @@ vcpkg_from_sourceforge( buffer_uninitialized.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/libaiff) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/libaiff") -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() file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/libaiff/*.h") foreach(HEADER ${HEADERS}) @@ -34,4 +33,4 @@ foreach(HEADER ${HEADERS}) endforeach() # 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/libaiff/vcpkg.json b/ports/libaiff/vcpkg.json index d8e0abb4cfb84c..1626270f93c370 100644 --- a/ports/libaiff/vcpkg.json +++ b/ports/libaiff/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libaiff", "version-string": "5.0", - "port-version": 7, + "port-version": 8, "description": "LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features", - "homepage": "https://sourceforge.net/projects/aifftools" + "homepage": "https://sourceforge.net/projects/aifftools", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libcds/portfile.cmake b/ports/libcds/portfile.cmake index 4cdf9f2671d03c..bb09da12ec0d73 100644 --- a/ports/libcds/portfile.cmake +++ b/ports/libcds/portfile.cmake @@ -12,9 +12,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_INSTALL_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_INSTALL_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_UNIT_TEST=OFF -DENABLE_STRESS_TEST=OFF @@ -23,14 +22,14 @@ vcpkg_configure_cmake( "-DLIB_SUFFIX=" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibCDS) +vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/LibCDS) file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcds RENAME copyright) + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libcds/vcpkg.json b/ports/libcds/vcpkg.json index ceb4e56a2f52b2..6bac4a10f245dc 100644 --- a/ports/libcds/vcpkg.json +++ b/ports/libcds/vcpkg.json @@ -1,13 +1,21 @@ { "name": "libcds", "version": "2.3.3", - "port-version": 2, + "port-version": 3, "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.", "homepage": "https://github.com/khizmax/libcds", "license": "BSL-1.0", "supports": "!(arm & (osx | windows)) & !uwp", "dependencies": [ "boost-system", - "boost-thread" + "boost-thread", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index 06b4626775866a..518081b8fd4075 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( if (NOT VCPKG_USE_HEAD_VERSION) message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") endif() if (NOT VCPKG_USE_HEAD_VERSION) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF @@ -27,16 +26,16 @@ else() ) endif() -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if (VCPKG_USE_HEAD_VERSION) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libconfig) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/libconfig) endif() -foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DIR}/include/libconfig.h) +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "${CURRENT_PACKAGES_DIR}/include/libconfig.h") file(READ ${FILE} _contents) string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}") @@ -51,4 +50,4 @@ foreach(FILE ${CURRENT_PACKAGES_DIR}/include/libconfig.h++ ${CURRENT_PACKAGES_DI file(WRITE ${FILE} "${_contents}") endforeach() -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/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 6acd72878ba263..e8621327f1cc58 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libconfig", "version-string": "1.7.3", - "port-version": 1, + "port-version": 2, "description": "C/C++ library for processing configuration files", - "homepage": "https://github.com/hyperrealm/libconfig" + "homepage": "https://github.com/hyperrealm/libconfig", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } From bddbd7b28b87e0e9c5adea52cdcfb44bbdb53419 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:52:47 +0800 Subject: [PATCH 02/28] format manifest --- ports/kvasir-mpl/vcpkg.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/kvasir-mpl/vcpkg.json b/ports/kvasir-mpl/vcpkg.json index fe8942adeeca30..bb8326234e8346 100644 --- a/ports/kvasir-mpl/vcpkg.json +++ b/ports/kvasir-mpl/vcpkg.json @@ -4,11 +4,6 @@ "port-version": 2, "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.", "homepage": "https://github.com/kvasir-io/mpl", - "features": { - "test": { - "description": "Build with test" - } - }, "dependencies": [ { "name": "vcpkg-cmake", @@ -18,5 +13,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "test": { + "description": "Build with test" + } + } } From 8aa7fe31bf0df58a2d5930766f5116cdea30f5ba Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 15:54:06 +0800 Subject: [PATCH 03/28] version --- versions/baseline.json | 100 +++++++++++------------ versions/e-/eathread.json | 5 ++ versions/e-/ecos.json | 5 ++ versions/e-/entityx.json | 5 ++ versions/f-/fastfeat.json | 5 ++ versions/f-/fastlz.json | 5 ++ versions/f-/fdlibm.json | 5 ++ versions/f-/flashlight-cpu.json | 5 ++ versions/f-/flashlight-cuda.json | 5 ++ versions/f-/fmem.json | 5 ++ versions/f-/foonathan-memory.json | 5 ++ versions/f-/fp16.json | 5 ++ versions/f-/freeopcua.json | 5 ++ versions/f-/functions-framework-cpp.json | 5 ++ versions/f-/fxdiv.json | 5 ++ versions/g-/g2o.json | 5 ++ versions/g-/gamma.json | 5 ++ versions/g-/gasol.json | 5 ++ versions/g-/genann.json | 5 ++ versions/g-/gettimeofday.json | 5 ++ versions/g-/gflags.json | 5 ++ versions/g-/gl2ps.json | 5 ++ versions/g-/gli.json | 5 ++ versions/g-/globjects.json | 5 ++ versions/g-/gloo.json | 5 ++ versions/g-/glui.json | 5 ++ versions/g-/gmime.json | 5 ++ versions/g-/graphicsmagick.json | 5 ++ versions/h-/h5py-lzf.json | 5 ++ versions/h-/hayai.json | 5 ++ versions/h-/http-parser.json | 5 ++ versions/h-/hungarian.json | 5 ++ versions/i-/ignition-modularscripts.json | 5 ++ versions/i-/iniparser.json | 5 ++ versions/i-/io2d.json | 5 ++ versions/i-/itpp.json | 5 ++ versions/j-/jbig2dec.json | 5 ++ versions/j-/jbigkit.json | 5 ++ versions/j-/jinja2cpplight.json | 5 ++ versions/j-/json-spirit.json | 5 ++ versions/j-/json11.json | 5 ++ versions/j-/json5-parser.json | 5 ++ versions/k-/kd-soap.json | 5 ++ versions/k-/kenlm.json | 5 ++ versions/k-/kuku.json | 5 ++ versions/k-/kvasir-mpl.json | 5 ++ versions/l-/lapack.json | 5 ++ versions/l-/levmar.json | 5 ++ versions/l-/libaiff.json | 5 ++ versions/l-/libcds.json | 5 ++ versions/l-/libconfig.json | 5 ++ 51 files changed, 300 insertions(+), 50 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a83a6390709e65..8de9f8b14e8ef6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2178,7 +2178,7 @@ }, "eathread": { "baseline": "1.32.09", - "port-version": 3 + "port-version": 4 }, "ebml": { "baseline": "1.4.2", @@ -2190,7 +2190,7 @@ }, "ecos": { "baseline": "2.0.8", - "port-version": 1 + "port-version": 2 }, "ecsutil": { "baseline": "1.0.7.15", @@ -2254,7 +2254,7 @@ }, "entityx": { "baseline": "1.3.0", - "port-version": 3 + "port-version": 4 }, "entt": { "baseline": "3.11.1", @@ -2358,7 +2358,7 @@ }, "fastfeat": { "baseline": "391d5e9", - "port-version": 2 + "port-version": 3 }, "fastgltf": { "baseline": "0.2.0", @@ -2370,7 +2370,7 @@ }, "fastlz": { "baseline": "2021-05-10", - "port-version": 0 + "port-version": 1 }, "fastor": { "baseline": "2021-11-22", @@ -2402,7 +2402,7 @@ }, "fdlibm": { "baseline": "5.3", - "port-version": 5 + "port-version": 6 }, "ffmpeg": { "baseline": "5.1.2", @@ -2438,11 +2438,11 @@ }, "flashlight-cpu": { "baseline": "0.3", - "port-version": 3 + "port-version": 4 }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 4 + "port-version": 5 }, "flat": { "baseline": "2022-08-30", @@ -2474,7 +2474,7 @@ }, "fmem": { "baseline": "c-libs-2ccee3d2fb", - "port-version": 1 + "port-version": 2 }, "fmi4cpp": { "baseline": "0.8.0", @@ -2510,7 +2510,7 @@ }, "foonathan-memory": { "baseline": "2019-07-21", - "port-version": 2 + "port-version": 3 }, "forest": { "baseline": "12.1.0", @@ -2526,7 +2526,7 @@ }, "fp16": { "baseline": "2021-02-21", - "port-version": 0 + "port-version": 1 }, "fplus": { "baseline": "0.2.18-p0", @@ -2546,7 +2546,7 @@ }, "freeopcua": { "baseline": "20190125", - "port-version": 5 + "port-version": 6 }, "freerdp": { "baseline": "2.9.0", @@ -2598,7 +2598,7 @@ }, "functions-framework-cpp": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "fuzzylite": { "baseline": "6.0", @@ -2606,11 +2606,11 @@ }, "fxdiv": { "baseline": "2021-02-21", - "port-version": 0 + "port-version": 1 }, "g2o": { "baseline": "2020-02-07", - "port-version": 2 + "port-version": 3 }, "g3log": { "baseline": "2.1", @@ -2630,11 +2630,11 @@ }, "gamma": { "baseline": "gamma-2018-01-27", - "port-version": 4 + "port-version": 5 }, "gasol": { "baseline": "2018-01-04", - "port-version": 2 + "port-version": 3 }, "gaussianlib": { "baseline": "2019-08-04", @@ -2670,7 +2670,7 @@ }, "genann": { "baseline": "2019-07-10", - "port-version": 1 + "port-version": 2 }, "geogram": { "baseline": "1.7.6", @@ -2706,11 +2706,11 @@ }, "gettimeofday": { "baseline": "2017-10-14", - "port-version": 4 + "port-version": 5 }, "gflags": { "baseline": "2.2.2", - "port-version": 5 + "port-version": 6 }, "ghc-filesystem": { "baseline": "1.5.12", @@ -2734,7 +2734,7 @@ }, "gl2ps": { "baseline": "1.4.2", - "port-version": 1 + "port-version": 2 }, "gl3w": { "baseline": "2018-05-31", @@ -2758,7 +2758,7 @@ }, "gli": { "baseline": "2021-07-06", - "port-version": 0 + "port-version": 1 }, "glib": { "baseline": "2.75.3", @@ -2774,7 +2774,7 @@ }, "globjects": { "baseline": "1.1.0", - "port-version": 4 + "port-version": 5 }, "glog": { "baseline": "0.6.0", @@ -2782,7 +2782,7 @@ }, "gloo": { "baseline": "20201203", - "port-version": 0 + "port-version": 1 }, "glpk": { "baseline": "5.0", @@ -2794,11 +2794,11 @@ }, "glui": { "baseline": "2019-11-30", - "port-version": 1 + "port-version": 2 }, "gmime": { "baseline": "3.2.6", - "port-version": 3 + "port-version": 4 }, "gmmlib": { "baseline": "21.3.2", @@ -2862,7 +2862,7 @@ }, "graphicsmagick": { "baseline": "1.3.37", - "port-version": 1 + "port-version": 2 }, "graphite2": { "baseline": "1.3.14", @@ -2962,7 +2962,7 @@ }, "h5py-lzf": { "baseline": "2019-12-04", - "port-version": 1 + "port-version": 2 }, "halide": { "baseline": "14.0.0", @@ -2990,7 +2990,7 @@ }, "hayai": { "baseline": "2019-08-10", - "port-version": 1 + "port-version": 2 }, "hazelcast-cpp-client": { "baseline": "5.1.0", @@ -3050,11 +3050,11 @@ }, "http-parser": { "baseline": "2.9.4", - "port-version": 1 + "port-version": 2 }, "hungarian": { "baseline": "v0.1.3", - "port-version": 1 + "port-version": 2 }, "hunspell": { "baseline": "1.7.1", @@ -3134,7 +3134,7 @@ }, "ignition-modularscripts": { "baseline": "2022-05-11", - "port-version": 1 + "port-version": 2 }, "ignition-msgs1": { "baseline": "1.0.0", @@ -3238,7 +3238,7 @@ }, "iniparser": { "baseline": "2020-04-06", - "port-version": 3 + "port-version": 4 }, "inipp": { "baseline": "1.0.12", @@ -3262,7 +3262,7 @@ }, "io2d": { "baseline": "2020-09-14", - "port-version": 3 + "port-version": 4 }, "irrlicht": { "baseline": "1.8.4", @@ -3286,7 +3286,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 8 + "port-version": 9 }, "ixwebsocket": { "baseline": "11.4.3", @@ -3310,11 +3310,11 @@ }, "jbig2dec": { "baseline": "0.19", - "port-version": 1 + "port-version": 2 }, "jbigkit": { "baseline": "2.1", - "port-version": 5 + "port-version": 6 }, "jemalloc": { "baseline": "5.3.0", @@ -3322,7 +3322,7 @@ }, "jinja2cpplight": { "baseline": "2018-05-08", - "port-version": 1 + "port-version": 2 }, "joltphysics": { "baseline": "2.0.1", @@ -3350,15 +3350,15 @@ }, "json-spirit": { "baseline": "4.1.0", - "port-version": 2 + "port-version": 3 }, "json11": { "baseline": "2017-06-20", - "port-version": 4 + "port-version": 5 }, "json5-parser": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 4 }, "jsoncons": { "baseline": "0.169.0", @@ -3394,7 +3394,7 @@ }, "kd-soap": { "baseline": "1.9.0", - "port-version": 1 + "port-version": 2 }, "kdalgorithms": { "baseline": "2023-02-11", @@ -3414,7 +3414,7 @@ }, "kenlm": { "baseline": "20200924", - "port-version": 1 + "port-version": 2 }, "keystone": { "baseline": "0.9.2", @@ -3610,11 +3610,11 @@ }, "kuku": { "baseline": "2.1", - "port-version": 1 + "port-version": 2 }, "kvasir-mpl": { "baseline": "2019-08-06", - "port-version": 1 + "port-version": 2 }, "kwsys": { "baseline": "2021-08-06", @@ -3626,7 +3626,7 @@ }, "lapack": { "baseline": "2022-02-22", - "port-version": 0 + "port-version": 1 }, "lapack-reference": { "baseline": "3.11.0", @@ -3686,7 +3686,7 @@ }, "levmar": { "baseline": "2.6", - "port-version": 1 + "port-version": 2 }, "libaaplus": { "baseline": "2.36", @@ -3698,7 +3698,7 @@ }, "libaiff": { "baseline": "5.0", - "port-version": 7 + "port-version": 8 }, "libalkimia": { "baseline": "8.1.70", @@ -3758,7 +3758,7 @@ }, "libcds": { "baseline": "2.3.3", - "port-version": 2 + "port-version": 3 }, "libcerf": { "baseline": "1.13", @@ -3766,7 +3766,7 @@ }, "libconfig": { "baseline": "1.7.3", - "port-version": 1 + "port-version": 2 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index 4568b724d3b451..7b4434ea16cd0d 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8ed2ecc145010d5006de0c928fcd2a4a2e8fee5", + "version-string": "1.32.09", + "port-version": 4 + }, { "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", "version-string": "1.32.09", diff --git a/versions/e-/ecos.json b/versions/e-/ecos.json index 6f456c3f7d5b38..cd78df5f1dc24e 100644 --- a/versions/e-/ecos.json +++ b/versions/e-/ecos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "703c4032ca82d9e99a50d601173475064c1aba6d", + "version-string": "2.0.8", + "port-version": 2 + }, { "git-tree": "10196c7185540fa8faccc2f3afcce7be58ab5a1f", "version-string": "2.0.8", diff --git a/versions/e-/entityx.json b/versions/e-/entityx.json index 2d7bb14ca30960..24e3b2b5273f53 100644 --- a/versions/e-/entityx.json +++ b/versions/e-/entityx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4700e5bbb6f509f9710d7d54d4b6e3b993a0e50c", + "version-string": "1.3.0", + "port-version": 4 + }, { "git-tree": "191e57655630e9862440dd860de69d4baa62b089", "version-string": "1.3.0", diff --git a/versions/f-/fastfeat.json b/versions/f-/fastfeat.json index 7a85559db81658..74b3262aaecd79 100644 --- a/versions/f-/fastfeat.json +++ b/versions/f-/fastfeat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "481c21005b90325f0d539fa8b6c8f50c52a788d2", + "version-string": "391d5e9", + "port-version": 3 + }, { "git-tree": "c6df4d7e64a7c9cb69a300aa50f62e2fbb261138", "version-string": "391d5e9", diff --git a/versions/f-/fastlz.json b/versions/f-/fastlz.json index d8485dc2c2cfb4..8323a67adc2009 100644 --- a/versions/f-/fastlz.json +++ b/versions/f-/fastlz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "928aa7c9b63c2a6069f9194228517bd9e8a51cb4", + "version-date": "2021-05-10", + "port-version": 1 + }, { "git-tree": "638b6220eb5ca72dae00fb3b8bdd19834cf6b938", "version-date": "2021-05-10", diff --git a/versions/f-/fdlibm.json b/versions/f-/fdlibm.json index 51bdc1f0d1187f..7828ad293941b2 100644 --- a/versions/f-/fdlibm.json +++ b/versions/f-/fdlibm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0044990ec1a2169439f7e37f687700b3415dd384", + "version-string": "5.3", + "port-version": 6 + }, { "git-tree": "7edc287bacd598a942ca6b29ed47329204b07faa", "version-string": "5.3", diff --git a/versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json index 9f6e60debc4b82..249c85e86ccd60 100644 --- a/versions/f-/flashlight-cpu.json +++ b/versions/f-/flashlight-cpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99574a4b45f5995b03ed6c1afa167e73fb671cc6", + "version": "0.3", + "port-version": 4 + }, { "git-tree": "217b238dc2abf773a66a004f21d4c89dcc9324e3", "version": "0.3", diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index 3c6f29741703fd..bdd93c82997ac9 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c72ded7c36fb28e0ca690d6acb1cd6d7312f739f", + "version": "0.3", + "port-version": 5 + }, { "git-tree": "0c59cec24c52379832bb5b227963c0b6681346a7", "version": "0.3", diff --git a/versions/f-/fmem.json b/versions/f-/fmem.json index 7f4d3a6ae2e4bc..6a12f380dc93b8 100644 --- a/versions/f-/fmem.json +++ b/versions/f-/fmem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "519e545b40732911ea17d4d1cd06e3032e809e5a", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 2 + }, { "git-tree": "eedcb4d269e8f834eaeaceb6fd3b3f477c46b8b4", "version-string": "c-libs-2ccee3d2fb", diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index 735e3eff8e2b7a..aa0ad6882872db 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41921ed7fc5a24cec5a062747efba8fbe6385302", + "version-string": "2019-07-21", + "port-version": 3 + }, { "git-tree": "6e97aca605e065b0df1adaed316adc03d63b6334", "version-string": "2019-07-21", diff --git a/versions/f-/fp16.json b/versions/f-/fp16.json index 2785c93e5b7465..51c29c16ffa391 100644 --- a/versions/f-/fp16.json +++ b/versions/f-/fp16.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10882f45162017700d42311ef038e13b24036a31", + "version-date": "2021-02-21", + "port-version": 1 + }, { "git-tree": "849acf1f87e0194fda4cd5459e51c564874c60ed", "version-date": "2021-02-21", diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json index 1ee029185b51db..99211b648f95d8 100644 --- a/versions/f-/freeopcua.json +++ b/versions/f-/freeopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b695d89d8bee87e9c51794d3be7b19242449b22f", + "version-string": "20190125", + "port-version": 6 + }, { "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950", "version-string": "20190125", diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index f0118ceec51184..44db3a551d68e8 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45a5c1a22f1a77da261ad125ede7f6062efcc4c3", + "version": "1.1.0", + "port-version": 2 + }, { "git-tree": "b768a3659402920019edfe8455e08e350743bd78", "version": "1.1.0", diff --git a/versions/f-/fxdiv.json b/versions/f-/fxdiv.json index faae1bc5eb42cc..62509acca1397c 100644 --- a/versions/f-/fxdiv.json +++ b/versions/f-/fxdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2dc55cc1ffd57437aa1faad7b19628aeeec7349", + "version-string": "2021-02-21", + "port-version": 1 + }, { "git-tree": "58ee7e759479e81a3218ff4d5efb8ada40c40d65", "version-string": "2021-02-21", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 34e9d0dfa836f5..d3cb0be629eaea 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc7fe08434d9567548de73e5cdb3814e15e6e5a0", + "version-string": "2020-02-07", + "port-version": 3 + }, { "git-tree": "4fb8813de02bd243b25d9ed93065f9f9cba09e93", "version-string": "2020-02-07", diff --git a/versions/g-/gamma.json b/versions/g-/gamma.json index f507b7da0b9e69..c13c76d9723c50 100644 --- a/versions/g-/gamma.json +++ b/versions/g-/gamma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3865edb63336f0ac875357c33db58ac3897e0cf", + "version-string": "gamma-2018-01-27", + "port-version": 5 + }, { "git-tree": "335e66b704d42844b1fef58f31a05545aec2e328", "version-string": "gamma-2018-01-27", diff --git a/versions/g-/gasol.json b/versions/g-/gasol.json index f9e5c97d4e0669..ddbb2022e0257d 100644 --- a/versions/g-/gasol.json +++ b/versions/g-/gasol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21042390f57aa050d7399293b10d51906f31e006", + "version-date": "2018-01-04", + "port-version": 3 + }, { "git-tree": "50bd4cd06666ebc284bb8d8157057c5a451bc11d", "version-date": "2018-01-04", diff --git a/versions/g-/genann.json b/versions/g-/genann.json index 84c36d720cc160..89f3e32849b426 100644 --- a/versions/g-/genann.json +++ b/versions/g-/genann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acfb59df5aebff7170b3c0eb8b368c1c53d8dc65", + "version-string": "2019-07-10", + "port-version": 2 + }, { "git-tree": "74f4d685e744a09163c7bfcf502e3facc2d9bf95", "version-string": "2019-07-10", diff --git a/versions/g-/gettimeofday.json b/versions/g-/gettimeofday.json index 3dc3c259ef98ae..20dccbacc5ba4e 100644 --- a/versions/g-/gettimeofday.json +++ b/versions/g-/gettimeofday.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b409d118828c77ee7ba6851e68cad121b51037e0", + "version-string": "2017-10-14", + "port-version": 5 + }, { "git-tree": "c39979379abaf1ecee42cbae6e83d68cfb201f13", "version-string": "2017-10-14", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index e20ff41292fc09..8fcc1b3d7677ba 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6967a1a39d982bafb38e30cb610ea9e7588b364", + "version-string": "2.2.2", + "port-version": 6 + }, { "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945", "version-string": "2.2.2", diff --git a/versions/g-/gl2ps.json b/versions/g-/gl2ps.json index 87cc00eaf6f538..d53b45345135d3 100644 --- a/versions/g-/gl2ps.json +++ b/versions/g-/gl2ps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2edf37f217265d8adf3a0f2991dd43548cfa6eb", + "version-string": "1.4.2", + "port-version": 2 + }, { "git-tree": "25f89a8ea4ae01f360444c1583dc6549d3857966", "version-string": "1.4.2", diff --git a/versions/g-/gli.json b/versions/g-/gli.json index bf68470d3fbaa8..6a205ede175cc3 100644 --- a/versions/g-/gli.json +++ b/versions/g-/gli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67d8698da4ba95b750d61c8b978dd36916330f72", + "version-date": "2021-07-06", + "port-version": 1 + }, { "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd", "version-date": "2021-07-06", diff --git a/versions/g-/globjects.json b/versions/g-/globjects.json index 75340cf939c43f..b2d59d5845a277 100644 --- a/versions/g-/globjects.json +++ b/versions/g-/globjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12db5b728ab07e8eb55495f2c506d613080b6b19", + "version-string": "1.1.0", + "port-version": 5 + }, { "git-tree": "0d9e98af47d7eb383a98e39c5661e573b1197e8c", "version-string": "1.1.0", diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json index ca6fac1e07ad98..55918b94cf7424 100644 --- a/versions/g-/gloo.json +++ b/versions/g-/gloo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "933bd6abfcf800dbe3c54d72ae5a220a8a09d64e", + "version-string": "20201203", + "port-version": 1 + }, { "git-tree": "18761f45d66d3eae3a73891f39142bbae80460b8", "version-string": "20201203", diff --git a/versions/g-/glui.json b/versions/g-/glui.json index 00a7d98d6a4fbd..fff2b53131558b 100644 --- a/versions/g-/glui.json +++ b/versions/g-/glui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "725b8910f690cd9321b7113d421c6dc3c8ad469d", + "version-string": "2019-11-30", + "port-version": 2 + }, { "git-tree": "435b850a183a1fe599f56df300530e81c107cdfa", "version-string": "2019-11-30", diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index be91778a8186bb..375f848af7ccb1 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e83d82f04c976783d1427c25fcee9460f00b5138", + "version": "3.2.6", + "port-version": 4 + }, { "git-tree": "84aa2f50c54bb6f9bff5623b67ec8b7c2e427cbd", "version": "3.2.6", diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index 696ce14ce59dbd..04f2900c90a8f4 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74b28b9a105a43a0b5a07600dcc433d13490a872", + "version": "1.3.37", + "port-version": 2 + }, { "git-tree": "c6ed21bf630e77483e7df659e7fd65eeefc6b543", "version": "1.3.37", diff --git a/versions/h-/h5py-lzf.json b/versions/h-/h5py-lzf.json index 1339053f389e86..3b86c35537d034 100644 --- a/versions/h-/h5py-lzf.json +++ b/versions/h-/h5py-lzf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd1b3de8884f13754ba97f92452457a65b512331", + "version-string": "2019-12-04", + "port-version": 2 + }, { "git-tree": "9852b593ea75baeff7131615d49a46d32af54dfb", "version-string": "2019-12-04", diff --git a/versions/h-/hayai.json b/versions/h-/hayai.json index a5fa0b26bb053c..bbdb5bed11ab0c 100644 --- a/versions/h-/hayai.json +++ b/versions/h-/hayai.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f80284c04ec5cc12532aa91966a2b53a645eb9b", + "version-string": "2019-08-10", + "port-version": 2 + }, { "git-tree": "fd5029e80c71cecda898075929dd64666be78885", "version-string": "2019-08-10", diff --git a/versions/h-/http-parser.json b/versions/h-/http-parser.json index 8ed21169510d93..9187b8649f6581 100644 --- a/versions/h-/http-parser.json +++ b/versions/h-/http-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71efeb851fad02fcaf83d83f3924a64c9eb5d726", + "version-string": "2.9.4", + "port-version": 2 + }, { "git-tree": "55d462cc4fb637891cc2d1dda24a9bd97c7d38f5", "version-string": "2.9.4", diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index 116c8e8594bfa3..a56553660cf25b 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f35810c09f8afd23d428a4ddbe3f24c63332e17a", + "version-string": "v0.1.3", + "port-version": 2 + }, { "git-tree": "4440d428d76082b3b8af21c5eda247a33794b4ef", "version-string": "v0.1.3", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 1ee29b448c9e6d..7b36dfca476c15 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5389b610ec81d81b9bc09972707fe858a360431f", + "version-date": "2022-05-11", + "port-version": 2 + }, { "git-tree": "ae302700b77870b26543f2df7764304d848c198a", "version-date": "2022-05-11", diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index a52fdeec1c35f0..c9993af45e2ad8 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "007d70e1e633a3152e269ee47cd3fda3c1e6916e", + "version-date": "2020-04-06", + "port-version": 4 + }, { "git-tree": "b1a9b214d253fa9d677b4ed158bd5e0d0e4e8a31", "version-date": "2020-04-06", diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index a6c53b3c839dfb..962ea358ed3152 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a26832c45a2a304bcec1b95881e513426f37f40", + "version-date": "2020-09-14", + "port-version": 4 + }, { "git-tree": "281370843416f78e7c715a85db1b5754253b38ed", "version-date": "2020-09-14", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 9c7418be64bd05..37658c2695c1b1 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "177dc519693e7b7040a1a4192cba2f710e6993d6", + "version-semver": "4.3.1", + "port-version": 9 + }, { "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0", "version-semver": "4.3.1", diff --git a/versions/j-/jbig2dec.json b/versions/j-/jbig2dec.json index 7fbff5da5fc449..d7b92754dffa82 100644 --- a/versions/j-/jbig2dec.json +++ b/versions/j-/jbig2dec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "722b62c3986a81753b5ab45c2a6600442d431a92", + "version-string": "0.19", + "port-version": 2 + }, { "git-tree": "e60aa2c30fefe1269d1d8a6fede748cfa5736aed", "version-string": "0.19", diff --git a/versions/j-/jbigkit.json b/versions/j-/jbigkit.json index 242ea13a09aeeb..a2cba011cc84ed 100644 --- a/versions/j-/jbigkit.json +++ b/versions/j-/jbigkit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f911f39147ef804aa8a9f99e4292320393e2fa9", + "version-string": "2.1", + "port-version": 6 + }, { "git-tree": "fa2f967c15904877cd541d3c9d59f0c2f20f3fb4", "version-string": "2.1", diff --git a/versions/j-/jinja2cpplight.json b/versions/j-/jinja2cpplight.json index 8adffeb623be78..4e938cafcb0daa 100644 --- a/versions/j-/jinja2cpplight.json +++ b/versions/j-/jinja2cpplight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff001112e784cec532f187edef863ced618775de", + "version-string": "2018-05-08", + "port-version": 2 + }, { "git-tree": "14ce844353cb5d4b2dbca4d36daf84c248208de2", "version-string": "2018-05-08", diff --git a/versions/j-/json-spirit.json b/versions/j-/json-spirit.json index 8fb1586f21a1d2..b5a6c9ab5f81ea 100644 --- a/versions/j-/json-spirit.json +++ b/versions/j-/json-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0098c4d5c32139a1c97acdfb8025301f8adfc0d8", + "version-string": "4.1.0", + "port-version": 3 + }, { "git-tree": "d219034cdee1f6237e4863a001aece539df2ce8c", "version-string": "4.1.0", diff --git a/versions/j-/json11.json b/versions/j-/json11.json index 688a24f272c3cf..1dc41d4eabcae9 100644 --- a/versions/j-/json11.json +++ b/versions/j-/json11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28a255e488f3e6290a1575948a5a3c9e2227b695", + "version-string": "2017-06-20", + "port-version": 5 + }, { "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a", "version-string": "2017-06-20", diff --git a/versions/j-/json5-parser.json b/versions/j-/json5-parser.json index 4a67281942f827..e68d1bb2bdda9d 100644 --- a/versions/j-/json5-parser.json +++ b/versions/j-/json5-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1055a3ade2b63982a101f201e52e6d86ef7be075", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "e874e19b4f9b56647b5be1537ed0792041e96c25", "version-string": "1.0.0", diff --git a/versions/k-/kd-soap.json b/versions/k-/kd-soap.json index f621fc50c27277..b2f6be1090fd20 100644 --- a/versions/k-/kd-soap.json +++ b/versions/k-/kd-soap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f66d1a8b4c8ebf1f5991c47da543a2f57e9a887", + "version-string": "1.9.0", + "port-version": 2 + }, { "git-tree": "64e16ff8d17d3cadb5a951b5b20e15f99b6d82b1", "version-string": "1.9.0", diff --git a/versions/k-/kenlm.json b/versions/k-/kenlm.json index 0ad8159aedcb26..53864afecfe6d6 100644 --- a/versions/k-/kenlm.json +++ b/versions/k-/kenlm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06973a21cd4981c1f29c38c22e4fa773996192e6", + "version-string": "20200924", + "port-version": 2 + }, { "git-tree": "5fd24bb27699940f72b94a9c3cf3e77a7d645a76", "version-string": "20200924", diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index f12b159a3b303b..99db7de1bf44e2 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf22a4f77a182f6322fd4e66426e6605726a34ed", + "version-string": "2.1", + "port-version": 2 + }, { "git-tree": "fa4e0b6cf1ce1e5f0cd13fa2dba7953ddcfc3d6f", "version-string": "2.1", diff --git a/versions/k-/kvasir-mpl.json b/versions/k-/kvasir-mpl.json index 042536ad3322cf..e42e5550f2154e 100644 --- a/versions/k-/kvasir-mpl.json +++ b/versions/k-/kvasir-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2559dada39f727a1c88c17744ab163216e71e92e", + "version-string": "2019-08-06", + "port-version": 2 + }, { "git-tree": "0eed1d5cd20c82b4cd2031f0fb21c2a5655b13d1", "version-string": "2019-08-06", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 5803b592258a71..e3139873f3b216 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4a49191cf0375885a121d18e2e27c06b089618e", + "version-date": "2022-02-22", + "port-version": 1 + }, { "git-tree": "3a9c5b51e3480db058719db223df981e0e679819", "version-date": "2022-02-22", diff --git a/versions/l-/levmar.json b/versions/l-/levmar.json index d7490901a35b2c..a4fdb336b25dce 100644 --- a/versions/l-/levmar.json +++ b/versions/l-/levmar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61d8d5e40d44730da4b1f7fe4b64604c89e3cdff", + "version": "2.6", + "port-version": 2 + }, { "git-tree": "a869430352021a5fcecdd780a25e5ee0a4d769f5", "version": "2.6", diff --git a/versions/l-/libaiff.json b/versions/l-/libaiff.json index 0204fed5b4a549..581efc2650be08 100644 --- a/versions/l-/libaiff.json +++ b/versions/l-/libaiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5aba0317fa0e00b16d2d25ecba1700c360942b5", + "version-string": "5.0", + "port-version": 8 + }, { "git-tree": "1bd67ed6002176c79933b7e4c237e06604e16b1d", "version-string": "5.0", diff --git a/versions/l-/libcds.json b/versions/l-/libcds.json index 60bbde65468424..5ab8f58bf0f8bc 100644 --- a/versions/l-/libcds.json +++ b/versions/l-/libcds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "906eab84bb3c859220587561e5b3ba5423848562", + "version": "2.3.3", + "port-version": 3 + }, { "git-tree": "2030ee3d0c39352e9617f28fb14ed17c20b96741", "version": "2.3.3", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 9ec9af593e9ecc..b70c68d976074a 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c1f7593bea014494bfa5dc034c22f5739fb286a", + "version-string": "1.7.3", + "port-version": 2 + }, { "git-tree": "c9149e9c9d7a08455647bcadb1f178b7ee6ff3d2", "version-string": "1.7.3", From 5e0a5e81dbf4df845f255e82fcb1cad7945f9ad1 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 16:15:11 +0800 Subject: [PATCH 04/28] typo --- ports/eathread/portfile.cmake | 2 +- ports/ecos/portfile.cmake | 2 +- ports/flashlight-cpu/portfile.cmake | 2 +- ports/flashlight-cuda/portfile.cmake | 2 +- ports/foonathan-memory/portfile.cmake | 4 ++-- ports/freeopcua/portfile.cmake | 2 +- ports/functions-framework-cpp/portfile.cmake | 2 +- ports/g2o/portfile.cmake | 2 +- ports/gflags/portfile.cmake | 2 +- ports/gli/portfile.cmake | 2 +- ports/globjects/portfile.cmake | 2 +- ports/gloo/portfile.cmake | 2 +- ports/glui/portfile.cmake | 2 +- ports/graphicsmagick/portfile.cmake | 2 +- ports/h5py-lzf/portfile.cmake | 2 +- ports/hayai/portfile.cmake | 4 ++-- ports/http-parser/portfile.cmake | 2 +- ports/hungarian/portfile.cmake | 2 +- ports/ignition-modularscripts/vcpkg-port-config.cmake | 4 ++-- ports/iniparser/portfile.cmake | 2 +- ports/io2d/portfile.cmake | 2 +- ports/json5-parser/portfile.cmake | 2 +- ports/kd-soap/portfile.cmake | 2 +- ports/kuku/portfile.cmake | 2 +- ports/kvasir-mpl/portfile.cmake | 2 +- ports/libcds/portfile.cmake | 2 +- ports/libconfig/portfile.cmake | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index d8c8926bd27b18..04f7e998d017f8 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/EAThread) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EAThread) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ecos/portfile.cmake b/ports/ecos/portfile.cmake index 012f8b32e69936..618a4d14a50248 100644 --- a/ports/ecos/portfile.cmake +++ b/ports/ecos/portfile.cmake @@ -19,4 +19,4 @@ vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(CONFIG_PATH "share/ecos") \ No newline at end of file +vcpkg_cmake_config_fixup(CONFIG_PATH "share/ecos") \ No newline at end of file diff --git a/ports/flashlight-cpu/portfile.cmake b/ports/flashlight-cpu/portfile.cmake index d17fa47c827d3c..11459b6d055e84 100644 --- a/ports/flashlight-cpu/portfile.cmake +++ b/ports/flashlight-cpu/portfile.cmake @@ -47,7 +47,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(PACKAGE_NAME flashlight) +vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 433825ab627df0..49582ffb691cb9 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -46,7 +46,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(PACKAGE_NAME flashlight) +vcpkg_cmake_config_fixup(PACKAGE_NAME flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index a30934696a5c48..fcdff2fbb17478 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -35,9 +35,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_config_cmake_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake") - vcpkg_config_cmake_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) + vcpkg_cmake_config_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory) endif() vcpkg_copy_pdbs() diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake index 145ee1089d6e23..47450efcf8e74b 100644 --- a/ports/freeopcua/portfile.cmake +++ b/ports/freeopcua/portfile.cmake @@ -25,7 +25,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 919ff5b4d90e06..423b815a0040d9 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install(ADD_BIN_TO_PATH) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file( diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 133fc9db779d68..d5efce4c30c44b 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/g2o) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/g2o) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*") diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 09e102ed41ac29..fed9053482a6b7 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -24,7 +24,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/gflags) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index fa775256f6d722..e4a4edb42223ec 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/gli) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 7c9d93b44b9ab5..1ecdbb1003a0a1 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH share/globjects/cmake/globjects) +vcpkg_cmake_config_fixup(CONFIG_PATH share/globjects/cmake/globjects) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake index f84aba27e0de71..e9ed2af43f2da6 100644 --- a/ports/gloo/portfile.cmake +++ b/ports/gloo/portfile.cmake @@ -25,7 +25,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/Gloo) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Gloo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/glui/portfile.cmake b/ports/glui/portfile.cmake index e0c19a6a48d1e9..00a1ae192cee8e 100644 --- a/ports/glui/portfile.cmake +++ b/ports/glui/portfile.cmake @@ -16,7 +16,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(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index ef74a2975a0a9f..921e19fc48c68e 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -28,7 +28,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-graphicsmagick) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-graphicsmagick) # copy license file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/h5py-lzf/portfile.cmake b/ports/h5py-lzf/portfile.cmake index f3edfb8cf8441c..2ab6ee701e7d52 100644 --- a/ports/h5py-lzf/portfile.cmake +++ b/ports/h5py-lzf/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hayai/portfile.cmake b/ports/hayai/portfile.cmake index 93e9b27d1d3ca4..19d0c4ace0f309 100644 --- a/ports/hayai/portfile.cmake +++ b/ports/hayai/portfile.cmake @@ -24,9 +24,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") - vcpkg_config_cmake_fixup(CONFIG_PATH CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/CMake/${PORT}") - vcpkg_config_cmake_fixup(CONFIG_PATH lib/CMake/${PORT}) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/CMake/${PORT}) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index 64c338a8cbc93d..b186d7bc92a921 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-http-parser) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-http-parser) # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/${PORT}" RENAME copyright) diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index 29e2741329b052..bd86aa87650a70 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_config_cmake_fixup() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 5a30e876a3f480..e1cad23581391e 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -19,14 +19,14 @@ function(ignition_modular_build_library) # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") # Some ignition libraries install library subcomponents, that are effectively additional cmake packages - # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_config_cmake_fixup for them as well + # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_cmake_config_fixup for them as well file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES LIST_DIRECTORIES TRUE RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" "${CURRENT_PACKAGES_DIR}/lib/cmake/*") foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) - vcpkg_config_cmake_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() diff --git a/ports/iniparser/portfile.cmake b/ports/iniparser/portfile.cmake index ba7ec73534a8d1..4688037bc4b948 100644 --- a/ports/iniparser/portfile.cmake +++ b/ports/iniparser/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(PACKAGE_NAME unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index 29931fa41513f5..16edd25ede580c 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -27,7 +27,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/io2d) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/io2d) if (NOT VCPKG_TARGET_IS_OSX) file(RENAME "${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake") diff --git a/ports/json5-parser/portfile.cmake b/ports/json5-parser/portfile.cmake index 79b14c417a61ca..6d44e304b4deac 100644 --- a/ports/json5-parser/portfile.cmake +++ b/ports/json5-parser/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_config_cmake_fixup(CONFIG_PATH share/cmake/json5-parser) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/json5-parser) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 6976905323f66e..a6ab6424b0d003 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/KDSoap PACKAGE_NAME KDSoap) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KDSoap PACKAGE_NAME KDSoap) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}" diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake index 49bab6a6e32ada..72d97bfe877a3b 100644 --- a/ports/kuku/portfile.cmake +++ b/ports/kuku/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/Kuku-2.1) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kuku-2.1) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/kvasir-mpl/portfile.cmake b/ports/kvasir-mpl/portfile.cmake index 04c02e21960277..aac509e38156f4 100644 --- a/ports/kvasir-mpl/portfile.cmake +++ b/ports/kvasir-mpl/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/kvasir_mpl) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kvasir_mpl) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/libcds/portfile.cmake b/ports/libcds/portfile.cmake index bb09da12ec0d73..481d9d1d097dcb 100644 --- a/ports/libcds/portfile.cmake +++ b/ports/libcds/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/LibCDS) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/LibCDS) file(INSTALL "${SOURCE_PATH}/LICENSE" diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index 518081b8fd4075..48becfb120d538 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -32,7 +32,7 @@ vcpkg_copy_pdbs() if (VCPKG_USE_HEAD_VERSION) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_config_cmake_fixup(CONFIG_PATH lib/cmake/libconfig) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) endif() foreach(FILE "${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "${CURRENT_PACKAGES_DIR}/include/libconfig.h") From ea5d0d5b0db1a2dc23c1d9d0dd9dcb23af505970 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 16:15:21 +0800 Subject: [PATCH 05/28] version --- versions/e-/eathread.json | 2 +- versions/e-/ecos.json | 2 +- versions/f-/flashlight-cpu.json | 2 +- versions/f-/flashlight-cuda.json | 2 +- versions/f-/foonathan-memory.json | 2 +- versions/f-/freeopcua.json | 2 +- versions/f-/functions-framework-cpp.json | 2 +- versions/g-/g2o.json | 2 +- versions/g-/gflags.json | 2 +- versions/g-/gli.json | 2 +- versions/g-/globjects.json | 2 +- versions/g-/gloo.json | 2 +- versions/g-/glui.json | 2 +- versions/g-/graphicsmagick.json | 2 +- versions/h-/h5py-lzf.json | 2 +- versions/h-/hayai.json | 2 +- versions/h-/http-parser.json | 2 +- versions/h-/hungarian.json | 2 +- versions/i-/ignition-modularscripts.json | 2 +- versions/i-/iniparser.json | 2 +- versions/i-/io2d.json | 2 +- versions/j-/json5-parser.json | 2 +- versions/k-/kd-soap.json | 2 +- versions/k-/kuku.json | 2 +- versions/k-/kvasir-mpl.json | 2 +- versions/l-/libcds.json | 2 +- versions/l-/libconfig.json | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index 7b4434ea16cd0d..5b51e51694ccc7 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f8ed2ecc145010d5006de0c928fcd2a4a2e8fee5", + "git-tree": "9fa80549dce30b5378fb3e37f72408a764292226", "version-string": "1.32.09", "port-version": 4 }, diff --git a/versions/e-/ecos.json b/versions/e-/ecos.json index cd78df5f1dc24e..443d67dab2231c 100644 --- a/versions/e-/ecos.json +++ b/versions/e-/ecos.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "703c4032ca82d9e99a50d601173475064c1aba6d", + "git-tree": "2455be75623660f0f0d926cdbbbc0774fbc811ce", "version-string": "2.0.8", "port-version": 2 }, diff --git a/versions/f-/flashlight-cpu.json b/versions/f-/flashlight-cpu.json index 249c85e86ccd60..7adf9fdf651927 100644 --- a/versions/f-/flashlight-cpu.json +++ b/versions/f-/flashlight-cpu.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "99574a4b45f5995b03ed6c1afa167e73fb671cc6", + "git-tree": "611b4af4d5407cfaf1d3c007ade1daf858fb9b04", "version": "0.3", "port-version": 4 }, diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index bdd93c82997ac9..5146baa1628712 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c72ded7c36fb28e0ca690d6acb1cd6d7312f739f", + "git-tree": "b527614ea4e5f61aadf505b7b98380c8581cf910", "version": "0.3", "port-version": 5 }, diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index aa0ad6882872db..355ecf940423da 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "41921ed7fc5a24cec5a062747efba8fbe6385302", + "git-tree": "df99f89b313ffe694f509f27930db34929c667d4", "version-string": "2019-07-21", "port-version": 3 }, diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json index 99211b648f95d8..3482f51658916f 100644 --- a/versions/f-/freeopcua.json +++ b/versions/f-/freeopcua.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b695d89d8bee87e9c51794d3be7b19242449b22f", + "git-tree": "f392fbde1b513b294118eda3866f2dc9f3f5801e", "version-string": "20190125", "port-version": 6 }, diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index 44db3a551d68e8..7369ddb673e9a3 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "45a5c1a22f1a77da261ad125ede7f6062efcc4c3", + "git-tree": "471d196e586dbfd0e57c03fb0283ce559c8ac1b5", "version": "1.1.0", "port-version": 2 }, diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index d3cb0be629eaea..5f4db4179eb333 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bc7fe08434d9567548de73e5cdb3814e15e6e5a0", + "git-tree": "1ddb5ea36f841e99ee27d62d91696e424a6a9779", "version-string": "2020-02-07", "port-version": 3 }, diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 8fcc1b3d7677ba..82ea7b97b38393 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b6967a1a39d982bafb38e30cb610ea9e7588b364", + "git-tree": "efa13a8502868cddc46abd8c40103ea243ac3ff5", "version-string": "2.2.2", "port-version": 6 }, diff --git a/versions/g-/gli.json b/versions/g-/gli.json index 6a205ede175cc3..ebe13e6f6b5248 100644 --- a/versions/g-/gli.json +++ b/versions/g-/gli.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "67d8698da4ba95b750d61c8b978dd36916330f72", + "git-tree": "d73abd0b8e789e8fcbbe3dd35f136f77b9a4df64", "version-date": "2021-07-06", "port-version": 1 }, diff --git a/versions/g-/globjects.json b/versions/g-/globjects.json index b2d59d5845a277..16316c3891f46b 100644 --- a/versions/g-/globjects.json +++ b/versions/g-/globjects.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "12db5b728ab07e8eb55495f2c506d613080b6b19", + "git-tree": "898cc5c06c5f78cf8bc083681cc9120bb3f35d58", "version-string": "1.1.0", "port-version": 5 }, diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json index 55918b94cf7424..8a61bf3296d5b8 100644 --- a/versions/g-/gloo.json +++ b/versions/g-/gloo.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "933bd6abfcf800dbe3c54d72ae5a220a8a09d64e", + "git-tree": "cc23690fb0a8fb3d34ac9ffe5744c579803b1a3a", "version-string": "20201203", "port-version": 1 }, diff --git a/versions/g-/glui.json b/versions/g-/glui.json index fff2b53131558b..70303963c4710f 100644 --- a/versions/g-/glui.json +++ b/versions/g-/glui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "725b8910f690cd9321b7113d421c6dc3c8ad469d", + "git-tree": "37cd0cb58d7e854265a7fea59bd85193bee9ada3", "version-string": "2019-11-30", "port-version": 2 }, diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index 04f2900c90a8f4..700d0985e48b82 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "74b28b9a105a43a0b5a07600dcc433d13490a872", + "git-tree": "4172a8f41ac84cd6f6e61aa65594bfd51927ede1", "version": "1.3.37", "port-version": 2 }, diff --git a/versions/h-/h5py-lzf.json b/versions/h-/h5py-lzf.json index 3b86c35537d034..4f9fd48161f05a 100644 --- a/versions/h-/h5py-lzf.json +++ b/versions/h-/h5py-lzf.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bd1b3de8884f13754ba97f92452457a65b512331", + "git-tree": "9c9e7613c601a3b82f71a5ed94b5c0f42ddaf943", "version-string": "2019-12-04", "port-version": 2 }, diff --git a/versions/h-/hayai.json b/versions/h-/hayai.json index bbdb5bed11ab0c..332be2fbae4e9e 100644 --- a/versions/h-/hayai.json +++ b/versions/h-/hayai.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5f80284c04ec5cc12532aa91966a2b53a645eb9b", + "git-tree": "2cd4a041dd15964357120787ab069fdd9f755824", "version-string": "2019-08-10", "port-version": 2 }, diff --git a/versions/h-/http-parser.json b/versions/h-/http-parser.json index 9187b8649f6581..647b43834a4988 100644 --- a/versions/h-/http-parser.json +++ b/versions/h-/http-parser.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "71efeb851fad02fcaf83d83f3924a64c9eb5d726", + "git-tree": "b449b8c7c18d513fd15459d0c8b9f5cd8d955875", "version-string": "2.9.4", "port-version": 2 }, diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index a56553660cf25b..5e00a0db0ccb68 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f35810c09f8afd23d428a4ddbe3f24c63332e17a", + "git-tree": "a00a58863c0638d6a2596df74f29f126af6a101d", "version-string": "v0.1.3", "port-version": 2 }, diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 7b36dfca476c15..4c5aeeccb41bb1 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5389b610ec81d81b9bc09972707fe858a360431f", + "git-tree": "d478ffb306ed1e408f6bca2668f5cfee532dbf4a", "version-date": "2022-05-11", "port-version": 2 }, diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index c9993af45e2ad8..58e5b671fa3e87 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "007d70e1e633a3152e269ee47cd3fda3c1e6916e", + "git-tree": "5d0ebe4c712d31d56d364d08713ed6aac6b24d2f", "version-date": "2020-04-06", "port-version": 4 }, diff --git a/versions/i-/io2d.json b/versions/i-/io2d.json index 962ea358ed3152..e993e1f7f53aa8 100644 --- a/versions/i-/io2d.json +++ b/versions/i-/io2d.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4a26832c45a2a304bcec1b95881e513426f37f40", + "git-tree": "438cae22a8c4516713b0f496dc0739ec47657fcc", "version-date": "2020-09-14", "port-version": 4 }, diff --git a/versions/j-/json5-parser.json b/versions/j-/json5-parser.json index e68d1bb2bdda9d..61f1cb164eab45 100644 --- a/versions/j-/json5-parser.json +++ b/versions/j-/json5-parser.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1055a3ade2b63982a101f201e52e6d86ef7be075", + "git-tree": "b99d504c49a691ef7c602dfd1e38a92568ea3316", "version-string": "1.0.0", "port-version": 4 }, diff --git a/versions/k-/kd-soap.json b/versions/k-/kd-soap.json index b2f6be1090fd20..924c40f42af328 100644 --- a/versions/k-/kd-soap.json +++ b/versions/k-/kd-soap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4f66d1a8b4c8ebf1f5991c47da543a2f57e9a887", + "git-tree": "7b9bb24f40216593fd531cd9cf00dc8aecb391f2", "version-string": "1.9.0", "port-version": 2 }, diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index 99db7de1bf44e2..72fd69bfb882b9 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cf22a4f77a182f6322fd4e66426e6605726a34ed", + "git-tree": "a020a81b732d1c352a2842ca7d0684562d68796a", "version-string": "2.1", "port-version": 2 }, diff --git a/versions/k-/kvasir-mpl.json b/versions/k-/kvasir-mpl.json index e42e5550f2154e..507c7ed30cfd7f 100644 --- a/versions/k-/kvasir-mpl.json +++ b/versions/k-/kvasir-mpl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2559dada39f727a1c88c17744ab163216e71e92e", + "git-tree": "938089745a1de92b9272b002781e0dfd886de90c", "version-string": "2019-08-06", "port-version": 2 }, diff --git a/versions/l-/libcds.json b/versions/l-/libcds.json index 5ab8f58bf0f8bc..28666982538558 100644 --- a/versions/l-/libcds.json +++ b/versions/l-/libcds.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "906eab84bb3c859220587561e5b3ba5423848562", + "git-tree": "37d2eea2fb95351129bfdfd36de1b9da8186b740", "version": "2.3.3", "port-version": 3 }, diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index b70c68d976074a..2085d841480977 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2c1f7593bea014494bfa5dc034c22f5739fb286a", + "git-tree": "b315a37ac5b6bcbb8ac832174472f23700e85ed4", "version-string": "1.7.3", "port-version": 2 }, From ad3e2b9ee886b1f6dba6944746b504aecd542027 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 17:40:20 +0800 Subject: [PATCH 06/28] typo --- ports/fastlz/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/fastlz/portfile.cmake b/ports/fastlz/portfile.cmake index a5906f611f3fbb..2826af500abcea 100644 --- a/ports/fastlz/portfile.cmake +++ b/ports/fastlz/portfile.cmake @@ -19,4 +19,4 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT} "RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 4bacdfb1f3d1d616f36a225fd8d30cde820997cf Mon Sep 17 00:00:00 2001 From: jyu49 Date: Mon, 27 Feb 2023 17:40:33 +0800 Subject: [PATCH 07/28] version --- versions/f-/fastlz.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/f-/fastlz.json b/versions/f-/fastlz.json index 8323a67adc2009..2304233c0a6a69 100644 --- a/versions/f-/fastlz.json +++ b/versions/f-/fastlz.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "928aa7c9b63c2a6069f9194228517bd9e8a51cb4", + "git-tree": "5748f2209b7415408cb2766cde253567555abaff", "version-date": "2021-05-10", "port-version": 1 }, From 25980423f737c20ab938109138eee96c1553457b Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 10:39:49 +0800 Subject: [PATCH 08/28] fix typo --- ports/kd-soap/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index a6ab6424b0d003..345cdc68f04249 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -29,4 +29,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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) From d7d5e656112881a7cbab8adc9633f4c77030ff62 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 10:39:55 +0800 Subject: [PATCH 09/28] fix include --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index e1cad23581391e..fab09fa5509266 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,3 +1,6 @@ +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) From dcd7085676224355fd09aadedb5cd2251e55c4bc Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 10:40:15 +0800 Subject: [PATCH 10/28] version --- versions/i-/ignition-modularscripts.json | 2 +- versions/k-/kd-soap.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 4c5aeeccb41bb1..9fd7e8330cc20d 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d478ffb306ed1e408f6bca2668f5cfee532dbf4a", + "git-tree": "b9d0bb829c599725ca1884976bf1304b003eb293", "version-date": "2022-05-11", "port-version": 2 }, diff --git a/versions/k-/kd-soap.json b/versions/k-/kd-soap.json index 924c40f42af328..f4c9af52bbb71c 100644 --- a/versions/k-/kd-soap.json +++ b/versions/k-/kd-soap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7b9bb24f40216593fd531cd9cf00dc8aecb391f2", + "git-tree": "44b3f2d0b648ce70aec2d1915a0104990c33d55e", "version-string": "1.9.0", "port-version": 2 }, From 06b5227320346c7df1c62f96d2e783d2ef68d02c Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 13:18:04 +0800 Subject: [PATCH 11/28] re-fix include --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index fab09fa5509266..6f41cca3a0b31b 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,6 +1,6 @@ -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg_cmake_configure.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg_cmake_build.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg_cmake_install.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) From 2411825a33fe9ec0e12a3c3756ebd690ebbd3a9e Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 13:18:15 +0800 Subject: [PATCH 12/28] version --- versions/i-/ignition-modularscripts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 9fd7e8330cc20d..4682b53dc9d562 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b9d0bb829c599725ca1884976bf1304b003eb293", + "git-tree": "5d4625436bc66716d4e40dc9e26337943a9f3316", "version-date": "2022-05-11", "port-version": 2 }, From 753d2f630cfdaae865db09c284d1673b525ab7c0 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:02:03 +0800 Subject: [PATCH 13/28] re-fix include --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 6f41cca3a0b31b..3abb8ecbc9d559 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,6 +1,4 @@ -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg_cmake_configure.cmake") -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg_cmake_build.cmake") -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg_cmake_install.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) From 7a648d3b4b8fa92db0c04dd35f647ffd8b606dd8 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:02:15 +0800 Subject: [PATCH 14/28] version --- versions/i-/ignition-modularscripts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 4682b53dc9d562..a953d71d4d1996 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5d4625436bc66716d4e40dc9e26337943a9f3316", + "git-tree": "6029eabcc4dd4a4c59a74910aae66543cb4cb764", "version-date": "2022-05-11", "port-version": 2 }, From 2532a46c22d0acb0788d35cacd6e59c6fc5983ab Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:09:01 +0800 Subject: [PATCH 15/28] fix copyright path --- ports/http-parser/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index b186d7bc92a921..fd016b910e46e3 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -21,4 +21,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-http-parser) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From b2e2473551a4d160140d2d091acdeab26e47f54d Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:20:28 +0800 Subject: [PATCH 16/28] re-fix include --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 3abb8ecbc9d559..37bdf6c1b0690c 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,4 +1,5 @@ include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") +include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) From 0a27a2f9e054b9b5757433760a553deb291b7d37 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:20:44 +0800 Subject: [PATCH 17/28] version --- versions/h-/http-parser.json | 2 +- versions/i-/ignition-modularscripts.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/h-/http-parser.json b/versions/h-/http-parser.json index 647b43834a4988..c538f38f5043b4 100644 --- a/versions/h-/http-parser.json +++ b/versions/h-/http-parser.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b449b8c7c18d513fd15459d0c8b9f5cd8d955875", + "git-tree": "34facc76f4cbe06e33f14e298f041c28b4ae4c08", "version-string": "2.9.4", "port-version": 2 }, diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index a953d71d4d1996..26cea988df4823 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6029eabcc4dd4a4c59a74910aae66543cb4cb764", + "git-tree": "7ba983585c403981bb0263c6d91d107068b8bae1", "version-date": "2022-05-11", "port-version": 2 }, From 861d4fb99a9b62864ad68c9d3516bfdaf2f11fc6 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:26:11 +0800 Subject: [PATCH 18/28] deprecate TARGET_PATH --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 37bdf6c1b0690c..5e53137c458e12 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -29,7 +29,7 @@ function(ignition_modular_build_library) foreach(COMPONENT_CMAKE_PACKAGE_NAME IN LISTS COMPONENTS_CMAKE_PACKAGE_NAMES) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${COMPONENT_CMAKE_PACKAGE_NAME}" - TARGET_PATH "share/${COMPONENT_CMAKE_PACKAGE_NAME}" + PACKAGE_NAME ${COMPONENT_CMAKE_PACKAGE_NAME} DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() From 0c4743b64e000018f3b6024c89de142c8d533d1a Mon Sep 17 00:00:00 2001 From: jyu49 Date: Tue, 28 Feb 2023 14:26:31 +0800 Subject: [PATCH 19/28] version --- versions/i-/ignition-modularscripts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 26cea988df4823..9509692f248654 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7ba983585c403981bb0263c6d91d107068b8bae1", + "git-tree": "aa5b91cc0c3c810658e310c6217f2120b4724670", "version-date": "2022-05-11", "port-version": 2 }, From cda92ea25a1ba5517902dadf51fa4ee84af33ee4 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 10:41:12 +0800 Subject: [PATCH 20/28] deprecated vcpkg_extract_source_archive_ex --- ports/gmime/portfile.cmake | 2 +- ports/hungarian/portfile.cmake | 2 +- ports/jbigkit/portfile.cmake | 2 +- ports/levmar/portfile.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index 41ff3b5d343289..87d161d8b3fd7d 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIB_VERSION} diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index bd86aa87650a70..9788129bdaca3e 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 1fa105e351c307c07bb96892c9d4c44b167d92cbed80962a8653ac35b8afe00fcf5dcc2d920b95671d6c3cd86745362a64dd8dc173623a8179006e2c7b2cbc69 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index 49f6f243c59d8d..b024b9754cc3e4 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${JBIGKIT_HASH} ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH ) diff --git a/ports/levmar/portfile.cmake b/ports/levmar/portfile.cmake index e2b2c7c757ddcb..05817f81873571 100644 --- a/ports/levmar/portfile.cmake +++ b/ports/levmar/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt From 338352ed0c7c136e1f1ba811217e941b41e12316 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 10:41:22 +0800 Subject: [PATCH 21/28] version --- versions/g-/gmime.json | 2 +- versions/h-/hungarian.json | 2 +- versions/j-/jbigkit.json | 2 +- versions/l-/levmar.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 375f848af7ccb1..9d655f043e6843 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e83d82f04c976783d1427c25fcee9460f00b5138", + "git-tree": "addef2c426a7bcd0f1e9d17e6dc7536379fa0694", "version": "3.2.6", "port-version": 4 }, diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index 5e00a0db0ccb68..fbb9b6b7668405 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a00a58863c0638d6a2596df74f29f126af6a101d", + "git-tree": "508dfc98e39a26bd986fe317ee9de71af94420ce", "version-string": "v0.1.3", "port-version": 2 }, diff --git a/versions/j-/jbigkit.json b/versions/j-/jbigkit.json index a2cba011cc84ed..ab3b86e0e36add 100644 --- a/versions/j-/jbigkit.json +++ b/versions/j-/jbigkit.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2f911f39147ef804aa8a9f99e4292320393e2fa9", + "git-tree": "f877637667e1d1308ffe0c474a0f66ff585f200b", "version-string": "2.1", "port-version": 6 }, diff --git a/versions/l-/levmar.json b/versions/l-/levmar.json index a4fdb336b25dce..0b9d8425c21fa0 100644 --- a/versions/l-/levmar.json +++ b/versions/l-/levmar.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "61d8d5e40d44730da4b1f7fe4b64604c89e3cdff", + "git-tree": "0c50b0b3a4d4a87d6c0da885a73d1e922f63db06", "version": "2.6", "port-version": 2 }, From 72320cbb325f3840d08376026388943f999e58c6 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 11:03:28 +0800 Subject: [PATCH 22/28] fix arguments --- ports/gmime/portfile.cmake | 2 +- ports/hungarian/portfile.cmake | 2 +- ports/jbigkit/portfile.cmake | 2 +- ports/levmar/portfile.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index 87d161d8b3fd7d..5bff3b5ffcb92a 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIB_VERSION} ) diff --git a/ports/hungarian/portfile.cmake b/ports/hungarian/portfile.cmake index 9788129bdaca3e..c50969ae1bed73 100644 --- a/ports/hungarian/portfile.cmake +++ b/ports/hungarian/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 ) diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index b024b9754cc3e4..e9ed464557acec 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/levmar/portfile.cmake b/ports/levmar/portfile.cmake index 05817f81873571..9efcacf99d8338 100644 --- a/ports/levmar/portfile.cmake +++ b/ports/levmar/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( - OUT_SOURCE_PATH SOURCE_PATH + SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES add-install.patch # patch just adding the install commands to original CMakeLists.txt ) From 11b2fcb75e6c513a83fa2ccd71a0842a4c8ba5f0 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 11:03:38 +0800 Subject: [PATCH 23/28] version --- versions/g-/gmime.json | 2 +- versions/h-/hungarian.json | 2 +- versions/j-/jbigkit.json | 2 +- versions/l-/levmar.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index 9d655f043e6843..a54a05d0e8c2d0 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "addef2c426a7bcd0f1e9d17e6dc7536379fa0694", + "git-tree": "4ee8a0dfdbeb1190bc59abf04303bd891162b312", "version": "3.2.6", "port-version": 4 }, diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index fbb9b6b7668405..cd4d93c510239f 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "508dfc98e39a26bd986fe317ee9de71af94420ce", + "git-tree": "d993fa03434ccc29dd176ad7f26269b776311ae5", "version-string": "v0.1.3", "port-version": 2 }, diff --git a/versions/j-/jbigkit.json b/versions/j-/jbigkit.json index ab3b86e0e36add..cdda4be4490aa5 100644 --- a/versions/j-/jbigkit.json +++ b/versions/j-/jbigkit.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f877637667e1d1308ffe0c474a0f66ff585f200b", + "git-tree": "c7fb53a41d5e5c78d63f059202f6af2f9f59e805", "version-string": "2.1", "port-version": 6 }, diff --git a/versions/l-/levmar.json b/versions/l-/levmar.json index 0b9d8425c21fa0..008ad7285de12b 100644 --- a/versions/l-/levmar.json +++ b/versions/l-/levmar.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c50b0b3a4d4a87d6c0da885a73d1e922f63db06", + "git-tree": "508125c23a2ed68869f87ec7d6b4ec4bc2a70ff4", "version": "2.6", "port-version": 2 }, From 3d3411ec243b5d356ed40204745713790ac1aed9 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 14:48:46 +0800 Subject: [PATCH 24/28] Rename argument --- ports/gmime/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake index 5bff3b5ffcb92a..dbdc226e4e342b 100644 --- a/ports/gmime/portfile.cmake +++ b/ports/gmime/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF ${LIB_VERSION} + SOURCE_BASE "${LIB_VERSION}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") From 06ce22d2621657415de7625b853990f71ce96ded Mon Sep 17 00:00:00 2001 From: jyu49 Date: Wed, 1 Mar 2023 14:48:59 +0800 Subject: [PATCH 25/28] version --- versions/g-/gmime.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gmime.json b/versions/g-/gmime.json index a54a05d0e8c2d0..a7b534e01b0fb8 100644 --- a/versions/g-/gmime.json +++ b/versions/g-/gmime.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4ee8a0dfdbeb1190bc59abf04303bd891162b312", + "git-tree": "d287813046af576ad819b02730e4d6c30b917f39", "version": "3.2.6", "port-version": 4 }, From 145032f735f84f5767fc50ca44c206dee15eb024 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 20 Apr 2023 17:46:06 -0700 Subject: [PATCH 26/28] Use relative paths for host-to-host dependencies, as suggested by @ras0219-msft . --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 4 ++-- versions/i-/ignition-modularscripts.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 5e53137c458e12..78a7d844a4846e 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,5 +1,5 @@ -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-config/vcpkg-port-config.cmake") function(ignition_modular_build_library) set(options DISABLE_PKGCONFIG_INSTALL) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 9509692f248654..209fc5adc0b1d8 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aa5b91cc0c3c810658e310c6217f2120b4724670", + "git-tree": "7fc9e95fba6779bafd87bdaca7f4831f4eead669", "version-date": "2022-05-11", "port-version": 2 }, From 7d7676c20fb07f5d308e6b83c77865a6f4bbcbec Mon Sep 17 00:00:00 2001 From: jyu49 Date: Fri, 21 Apr 2023 11:30:42 +0800 Subject: [PATCH 27/28] typo --- ports/ignition-modularscripts/vcpkg-port-config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 78a7d844a4846e..6b589d7f866efd 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -53,8 +53,8 @@ function(ignition_modular_build_library) endif() vcpkg_fixup_pkgconfig(${SYSTEM_LIBRARIES}) else() - file(REMOVE_RECURSE "{CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "{CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() # Find the relevant license file and install it From 97b9b4b8910c7780e7d7e4d777aa5f20c7878656 Mon Sep 17 00:00:00 2001 From: jyu49 Date: Fri, 21 Apr 2023 11:31:27 +0800 Subject: [PATCH 28/28] version --- versions/i-/ignition-modularscripts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 209fc5adc0b1d8..748dd797a245ad 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7fc9e95fba6779bafd87bdaca7f4831f4eead669", + "git-tree": "bc5dc2fa00b5023e9f2fa1610a986e8d61874380", "version-date": "2022-05-11", "port-version": 2 },