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

Add vcpkg_minimum_required before using VERSION. #27598

Merged
merged 5 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions ports/cairomm/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_download_distfile(ARCHIVE
URLS "https://www.cairographics.org/releases/cairomm-${VERSION}.tar.xz"
FILENAME "cairomm-${VERSION}.tar.xz"
Expand Down
1 change: 1 addition & 0 deletions ports/cairomm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "cairomm",
"version": "1.16.2",
"port-version": 1,
"description": "A C++ wrapper for the cairo graphics library",
"homepage": "https://www.cairographics.org",
"license": "LGPL-2.0-only",
Expand Down
3 changes: 2 additions & 1 deletion ports/gdk-pixbuf/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.gnome.org/
OUT_SOURCE_PATH SOURCE_PATH
Expand Down Expand Up @@ -42,7 +43,7 @@ endif()
vcpkg_fixup_pkgconfig()

set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders)
# gdk-pixbuf-thumbnailer is not compiled for cross-compiling
# gdk-pixbuf-thumbnailer is not compiled for cross-compiling
# vcpkg-meson cross-build configuration differs from VCPKG_CROSSCOMPILING
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/gdk-pixbuf-thumbnailer${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
list(APPEND TOOL_NAMES gdk-pixbuf-thumbnailer)
Expand Down
2 changes: 1 addition & 1 deletion ports/gdk-pixbuf/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gdk-pixbuf",
"version": "2.42.9",
"port-version": 2,
"port-version": 3,
"description": "Image loading library.",
"homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
"license": "LGPL-2.1-or-later",
Expand Down
1 change: 1 addition & 0 deletions ports/libcanberra/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
if(VCPKG_TARGET_IS_OSX)
message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with brew install automake libtool")
else()
Expand Down
2 changes: 1 addition & 1 deletion ports/libcanberra/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libcanberra",
"version": "0.30",
"port-version": 3,
"port-version": 4,
"description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops",
"homepage": "http://0pointer.de/lennart/projects/libcanberra/",
"license": "LGPL-2.1-or-later",
Expand Down
5 changes: 3 additions & 2 deletions ports/qt-advanced-docking-system/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO githubuser0xFFFF/Qt-Advanced-Docking-System
REF d5fefaa35fb53e299b7f39b0d8f541954c710d94
SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22
SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22
HEAD_REF master
PATCHES
config_changes.patch
Expand All @@ -17,7 +18,7 @@ endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
OPTIONS
${_qarg_OPTIONS}
-DBUILD_EXAMPLES=OFF
-DADS_VERSION=${VERSION}
Expand Down
2 changes: 1 addition & 1 deletion ports/qt-advanced-docking-system/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qt-advanced-docking-system",
"version": "3.8.2",
"port-version": 1,
"port-version": 2,
"description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio",
"homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System",
"license": "LGPL-2.1-only",
Expand Down
1 change: 1 addition & 0 deletions ports/shader-slang/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

if (VCPKG_TARGET_IS_WINDOWS)
Expand Down
1 change: 1 addition & 0 deletions ports/shader-slang/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "shader-slang",
"version": "0.23.13",
"port-version": 1,
"description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.",
"homepage": "https://github.com/shader-slang/slang",
"license": "MIT",
Expand Down
3 changes: 2 additions & 1 deletion ports/vcpkg-tool-nodejs/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

set(PROGNAME node)
Expand Down Expand Up @@ -55,7 +56,7 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'")

vcpkg_execute_in_download_mode(
COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}"
COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}"
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
)

Expand Down
1 change: 1 addition & 0 deletions ports/vcpkg-tool-nodejs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "vcpkg-tool-nodejs",
"version-semver": "16.18.0",
"port-version": 1,
"supports": "native"
}
12 changes: 6 additions & 6 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@
},
"cairomm": {
"baseline": "1.16.2",
"port-version": 0
"port-version": 1
},
"calceph": {
"baseline": "3.5.1",
Expand Down Expand Up @@ -2550,7 +2550,7 @@
},
"gdk-pixbuf": {
"baseline": "2.42.9",
"port-version": 2
"port-version": 3
},
"gemmlowp": {
"baseline": "2021-09-28",
Expand Down Expand Up @@ -3594,7 +3594,7 @@
},
"libcanberra": {
"baseline": "0.30",
"port-version": 3
"port-version": 4
},
"libcbor": {
"baseline": "0.9.0",
Expand Down Expand Up @@ -6022,7 +6022,7 @@
},
"qt-advanced-docking-system": {
"baseline": "3.8.2",
"port-version": 1
"port-version": 2
},
"qt3d": {
"baseline": "6.3.2",
Expand Down Expand Up @@ -6842,7 +6842,7 @@
},
"shader-slang": {
"baseline": "0.23.13",
"port-version": 0
"port-version": 1
},
"shaderc": {
"baseline": "2021.1",
Expand Down Expand Up @@ -7786,7 +7786,7 @@
},
"vcpkg-tool-nodejs": {
"baseline": "16.18.0",
"port-version": 0
"port-version": 1
},
"vcpkg-tool-python2": {
"baseline": "2.7.18",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cairomm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "09ffff4bc160350ef161188b000610cbe9cfff8e",
"version": "1.16.2",
"port-version": 1
},
{
"git-tree": "07289b1edb75fecd2b706118b1a0919c5903c1c3",
"version": "1.16.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gdk-pixbuf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b1a623b67b4de018a0550b7d8cd60a21569972b0",
"version": "2.42.9",
"port-version": 3
},
{
"git-tree": "b42054b8e96faa6387ef8df5870276df1b0902e1",
"version": "2.42.9",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libcanberra.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "22130c2bd67b576a35d31bf27113f3ab96c48d05",
"version": "0.30",
"port-version": 4
},
{
"git-tree": "3b2ba637761d93c1a71e356c0249c54933655b09",
"version": "0.30",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qt-advanced-docking-system.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0e2298c569112e322898697b9680723c35a55cd5",
"version": "3.8.2",
"port-version": 2
},
{
"git-tree": "cdafc879bca2bc737f24557664c1384982bb1fe3",
"version": "3.8.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/shader-slang.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55e34d39bb61d4e1c78131c60561462b0abcdeaa",
"version": "0.23.13",
"port-version": 1
},
{
"git-tree": "803e379ae9dedf9c444fe40cc72b83b07d6f7f1c",
"version": "0.23.13",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-tool-nodejs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2738f551c277a4ac6650e7d140fc36aa26210a63",
"version-semver": "16.18.0",
"port-version": 1
},
{
"git-tree": "4d06168d3fdce7bd667e9cbc44adc453167dfbcc",
"version-semver": "16.18.0",
Expand Down