Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[multiple-ports] Fix missing usage #29345

Merged
merged 10 commits into from
Feb 9, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/angle/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,5 @@ foreach(_file ${_double_files})
file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}")
endif()
endforeach()

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/angle/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angle",
"version-string": "chromium_4472",
"port-version": 7,
"port-version": 8,
"description": [
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
"The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
Expand Down
2 changes: 1 addition & 1 deletion ports/boost/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Cheney-W marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion ports/boost/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost",
"version": "1.81.0",
"port-version": 1,
"port-version": 2,
"description": "Peer-reviewed portable C++ source libraries",
"homepage": "https://boost.org",
"license": "BSL-1.0",
Expand Down
2 changes: 2 additions & 0 deletions ports/colmap/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,5 @@ file(REMOVE_RECURSE
vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/colmap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "colmap",
"version-date": "2022-03-14",
"port-version": 1,
"port-version": 2,
"description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
"homepage": "https://colmap.github.io/",
"license": "BSD-3-Clause",
Expand Down
2 changes: 2 additions & 0 deletions ports/dcmtk/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,5 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "
vcpkg_fixup_pkgconfig()

file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
reitowo marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion ports/dcmtk/usage
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ The package dcmtk provides CMake targets:

find_package(DCMTK CONFIG REQUIRED)
# Note: 23 target(s) were omitted.
target_link_libraries(main PRIVATE cmr i2d ijg8 dcmfg)
target_link_libraries(main PRIVATE DCMTK::cmr DCMTK::i2d DCMTK::ijg8 DCMTK::DCMTK)
reitowo marked this conversation as resolved.
Show resolved Hide resolved

Add the following cmake code to your CMakeLists.txt to create definitions for DCMTK
if ("${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" STREQUAL "/")
Expand Down
2 changes: 1 addition & 1 deletion ports/dcmtk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dcmtk",
"version": "3.6.7",
"port-version": 3,
"port-version": 4,
"description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
"homepage": "https://github.com/DCMTK/dcmtk",
"license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
Expand Down
2 changes: 2 additions & 0 deletions ports/farmhash/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ file(INSTALL "${SOURCE_PATH}/COPYING"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/farmhashConfig.cmake"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
4 changes: 2 additions & 2 deletions ports/farmhash/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "farmhash",
"version-string": "1.1",
"port-version": 4,
"version": "1.1",
"port-version": 5,
"description": "FarmHash, a family of hash functions.",
"homepage": "https://github.com/google/farmhash",
"supports": "!arm"
Expand Down
2 changes: 2 additions & 0 deletions ports/googleapis/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
reitowo marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion ports/googleapis/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "googleapis",
"version-string": "alias",
"port-version": 1,
"port-version": 2,
"description": "Deprecated, use google-cloud-cpp instead.",
"dependencies": [
"google-cloud-cpp"
Expand Down
2 changes: 2 additions & 0 deletions ports/gtest/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ endif()
vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
1 change: 1 addition & 0 deletions ports/gtest/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "gtest",
"version-semver": "1.12.1",
"port-version": 1,
"description": "GoogleTest and GoogleMock testing frameworks",
"homepage": "https://github.com/google/googletest",
"license": "BSD-3-Clause",
Expand Down
2 changes: 2 additions & 0 deletions ports/imgui-sfml/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME ImGui-SFML CONFIG_PATH lib/cmake/ImGui-SFM
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/imgui-sfml/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "imgui-sfml",
"version": "2.5",
"port-version": 2,
"port-version": 3,
"description": "ImGui binding for use with SFML",
"homepage": "https://github.com/eliasdaler/imgui-sfml",
"license": "MIT",
Expand Down
2 changes: 2 additions & 0 deletions ports/libgeotiff/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

file(INSTALL "${SOURCE_PATH}/libgeotiff/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/libgeotiff/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libgeotiff",
"version": "1.7.1",
"port-version": 1,
"port-version": 2,
"description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.",
"homepage": "https://github.com/OSGeo/libgeotiff",
"license": "MIT",
Expand Down
2 changes: 2 additions & 0 deletions ports/nmap/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,5 @@ vcpkg_copy_pdbs()

# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/nmap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nmap",
"version": "7.70",
"port-version": 7,
"port-version": 8,
"description": "A library for scanning network ports.",
"dependencies": [
{
Expand Down
2 changes: 2 additions & 0 deletions ports/opengl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ if(VCPKG_TARGET_IS_WINDOWS)
else()
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
endif()

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
1 change: 1 addition & 0 deletions ports/opengl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "opengl",
"version-date": "2022-12-04",
"port-version": 1,
"description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.",
"license": null,
"dependencies": [
Expand Down
2 changes: 2 additions & 0 deletions ports/poppler/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
reitowo marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 2 additions & 4 deletions ports/poppler/usage
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
The package poppler can be imported via CMake FindPkgConfig module:

find_package(PkgConfig)
pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp)

target_link_libraries(main PRIVATE PkgConfig::POPPLER_CPP)
find_package(unofficial-poppler CONFIG REQUIRED)
target_link_libraries(main PRIVATE unofficial::poppler::poppler-cpp unofficial::poppler::poppler-private)
Cheney-W marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions ports/poppler/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "poppler",
"version": "23.1.0",
"port-version": 1,
"description": "A PDF rendering library",
"homepage": "https://poppler.freedesktop.org/",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 2 additions & 0 deletions ports/unixodbc/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ endforeach()

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/unixodbc/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "unixodbc",
"version": "2.3.11",
"port-version": 1,
"port-version": 2,
"description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX",
"homepage": "https://github.com/lurcher/unixODBC",
"license": "LGPL-2.1-only",
Expand Down
2 changes: 2 additions & 0 deletions ports/vulkan/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ else()
endif()

SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
4 changes: 2 additions & 2 deletions ports/vulkan/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vulkan",
"version-string": "1.1.82.1",
"port-version": 2,
"version": "1.1.82.1",
"port-version": 3,
"description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices."
}
2 changes: 2 additions & 0 deletions ports/xerces-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
endif()

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
2 changes: 1 addition & 1 deletion ports/xerces-c/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "xerces-c",
"version": "3.2.4",
"port-version": 1,
"port-version": 2,
"description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.",
"homepage": "https://github.com/apache/xerces-c",
"license": "Apache-2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/angle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3b82e62ec84b36302f2e1b7a6356811d367dd88f",
"version-string": "chromium_4472",
"port-version": 8
},
{
"git-tree": "96213b303b5b0804d7c8e9b6b94aa3cd3cc90660",
"version-string": "chromium_4472",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e2f8e94c0c601b0f0ceea22071e9c40d74f6d2a",
"version": "1.81.0",
"port-version": 2
},
{
"git-tree": "ecebe0b2a1d34ab9e5ca9ccdb8c16f9f8b36b5ed",
"version": "1.81.0",
Expand Down
30 changes: 15 additions & 15 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
},
"angle": {
"baseline": "chromium_4472",
"port-version": 7
"port-version": 8
},
"antlr4": {
"baseline": "4.11.1",
Expand Down Expand Up @@ -586,7 +586,7 @@
},
"boost": {
"baseline": "1.81.0",
"port-version": 1
"port-version": 2
},
"boost-accumulators": {
"baseline": "1.81.0",
Expand Down Expand Up @@ -1586,7 +1586,7 @@
},
"colmap": {
"baseline": "2022-03-14",
"port-version": 1
"port-version": 2
},
"color-console": {
"baseline": "2022-03-20",
Expand Down Expand Up @@ -1950,7 +1950,7 @@
},
"dcmtk": {
"baseline": "3.6.7",
"port-version": 3
"port-version": 4
},
"debug-assert": {
"baseline": "1.3.3",
Expand Down Expand Up @@ -2302,7 +2302,7 @@
},
"farmhash": {
"baseline": "1.1",
"port-version": 4
"port-version": 5
},
"fast-cpp-csv-parser": {
"baseline": "2021-01-03",
Expand Down Expand Up @@ -2794,7 +2794,7 @@
},
"googleapis": {
"baseline": "alias",
"port-version": 1
"port-version": 2
},
"gperf": {
"baseline": "3.1",
Expand Down Expand Up @@ -2874,7 +2874,7 @@
},
"gtest": {
"baseline": "1.12.1",
"port-version": 0
"port-version": 1
},
"gtk": {
"baseline": "4.6.8",
Expand Down Expand Up @@ -3170,7 +3170,7 @@
},
"imgui-sfml": {
"baseline": "2.5",
"port-version": 2
"port-version": 3
},
"imguizmo": {
"baseline": "1.83",
Expand Down Expand Up @@ -3886,7 +3886,7 @@
},
"libgeotiff": {
"baseline": "1.7.1",
"port-version": 1
"port-version": 2
},
"libgit2": {
"baseline": "1.4.2",
Expand Down Expand Up @@ -5366,7 +5366,7 @@
},
"nmap": {
"baseline": "7.70",
"port-version": 7
"port-version": 8
},
"nmslib": {
"baseline": "2.1.1",
Expand Down Expand Up @@ -5638,7 +5638,7 @@
},
"opengl": {
"baseline": "2022-12-04",
"port-version": 0
"port-version": 1
},
"opengl-registry": {
"baseline": "2022-09-29",
Expand Down Expand Up @@ -6054,7 +6054,7 @@
},
"poppler": {
"baseline": "23.1.0",
"port-version": 0
"port-version": 1
},
"popsift": {
"baseline": "0.9",
Expand Down Expand Up @@ -7878,7 +7878,7 @@
},
"unixodbc": {
"baseline": "2.3.11",
"port-version": 1
"port-version": 2
},
"unqlite": {
"baseline": "1.1.9",
Expand Down Expand Up @@ -8118,7 +8118,7 @@
},
"vulkan": {
"baseline": "1.1.82.1",
"port-version": 2
"port-version": 3
},
"vulkan-headers": {
"baseline": "1.3.239",
Expand Down Expand Up @@ -8350,7 +8350,7 @@
},
"xerces-c": {
"baseline": "3.2.4",
"port-version": 1
"port-version": 2
},
"xeus": {
"baseline": "0.24.3",
Expand Down
Loading