Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Browse files Browse the repository at this point in the history
…ithout-installed-msvc
  • Loading branch information
Neumann-A committed Jan 15, 2025
2 parents f93dc7f + 6220088 commit 55d1b68
Show file tree
Hide file tree
Showing 351 changed files with 4,028 additions and 3,019 deletions.
2 changes: 1 addition & 1 deletion ports/autodock-vina/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_policy(VERSION 3.11)

project(autodock-vina)

set(GIT_VERSION v1.2.5)
set(GIT_VERSION v1.2.6)
set(CMAKE_CXX_STANDARD 11)

find_package(Boost REQUIRED COMPONENTS
Expand Down
46 changes: 0 additions & 46 deletions ports/autodock-vina/fix-compatibility-with-boost-1.83.patch

This file was deleted.

30 changes: 0 additions & 30 deletions ports/autodock-vina/fix-compatibility-with-boost-1.85.patch

This file was deleted.

5 changes: 1 addition & 4 deletions ports/autodock-vina/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ccsb-scripps/AutoDock-Vina
REF v${VERSION}
SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
SHA512 8f974aa5772575af950e90206e98a9ac29f5ddaed2db47b3756df4cb7a79d38eb21384e14dc2359ad3c2d4957df5a5d120fc117223d0ee312012323d834ba654
HEAD_REF develop
PATCHES
fix-compatibility-with-boost-1.83.patch
fix-compatibility-with-boost-1.85.patch
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
Expand Down
5 changes: 2 additions & 3 deletions ports/autodock-vina/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"name": "autodock-vina",
"version-semver": "1.2.5",
"port-version": 3,
"version-semver": "1.2.6",
"description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
"homepage": "http://vina.scripps.edu/",
"homepage": "https://vina.scripps.edu/",
"dependencies": [
"boost-algorithm",
"boost-array",
Expand Down
1 change: 0 additions & 1 deletion ports/bitserializer-cpprestjson/portfile.cmake

This file was deleted.

14 changes: 0 additions & 14 deletions ports/bitserializer-cpprestjson/vcpkg.json

This file was deleted.

1 change: 0 additions & 1 deletion ports/bitserializer-pugixml/portfile.cmake

This file was deleted.

14 changes: 0 additions & 14 deletions ports/bitserializer-pugixml/vcpkg.json

This file was deleted.

1 change: 0 additions & 1 deletion ports/bitserializer-rapidjson/portfile.cmake

This file was deleted.

14 changes: 0 additions & 14 deletions ports/bitserializer-rapidjson/vcpkg.json

This file was deleted.

1 change: 0 additions & 1 deletion ports/bitserializer-rapidyaml/portfile.cmake

This file was deleted.

14 changes: 0 additions & 14 deletions ports/bitserializer-rapidyaml/vcpkg.json

This file was deleted.

4 changes: 2 additions & 2 deletions ports/bitserializer/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PavelKisliak/BitSerializer
REF v0.70
SHA512 efd6d9e00bbbe9ef541b2bea8ee8417befcc6482e96241689f39ab130743a1e3fbf2e22ae81c4291d15091f63f94f20964ad873a8601c2f5d98e7021aaedc793
REF v0.75
SHA512 ae31f17a0b4e488892f676eafe94e2d43a381153b9179891a9d3a6380c7b3f12d29bc20b7be270a71305bc7c27b08395f6aa8a8be26c52934e148e7140d34d21
HEAD_REF master
)

Expand Down
4 changes: 2 additions & 2 deletions ports/bitserializer/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bitserializer",
"version": "0.70",
"description": "C++ 17 library for serialization to JSON, XML, YAML, CSV",
"version": "0.75",
"description": "C++ 17 library for serialization to JSON, XML, YAML, CSV, MsgPack",
"homepage": "https://github.com/PavelKisliak/BitSerializer",
"license": "MIT",
"dependencies": [
Expand Down
5 changes: 5 additions & 0 deletions ports/boost-function/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-function",
"version": "1.86.0",
"port-version": 1,
"description": "Boost function module",
"homepage": "https://www.boost.org/libs/function",
"license": "BSL-1.0",
Expand Down Expand Up @@ -33,6 +34,10 @@
{
"name": "boost-throw-exception",
"version>=": "1.86.0"
},
{
"name": "boost-type-traits",
"version>=": "1.86.0"
}
]
}
Loading

0 comments on commit 55d1b68

Please sign in to comment.