Skip to content

Commit

Permalink
Merge branch 'master' into clangcltriplets
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn committed Oct 23, 2024
2 parents 439dd01 + 31554ea commit 4947417
Show file tree
Hide file tree
Showing 2,233 changed files with 15,291 additions and 12,834 deletions.
4 changes: 2 additions & 2 deletions ports/ace/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
FILENAME "ACE-TAO-${VERSION}.tar.gz"
SHA512 ee46897e13ba943c48d7b04c0792cef8ff48403b048af4eeced4bbfd874dece5ec1130a18216fd31fdbd610e3947673e56e306ab52ee3f1124975b1adaf21838
SHA512 e1eb967920eca25a131cb798312877be60790790c97439a99c1db0819749fa26e06f04090c50aed6fac80bfaafd58473e396f67ec24724587104f2b33cdfb703
)
else()
# Don't change to vcpkg_from_github! This points to a release and not an archive
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
FILENAME "ACE-src-${VERSION}.tar.gz"
SHA512 a29f8009e8f9e12c7c6d4ad9f39f76a62245baeb9fcfe08e346c1a004aedb5ab9d808a2390cde2dc71013be1b0de2ddd9d0dea26144536061e6416554233f547
SHA512 2010dcb07758e3d8400fa267b48a4ac0090d620955bee16f1ab3f4f7670c34b7464872b965f8078c7b1eec48d586367ae136cd0095946a75a69bac379d3bf781
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/ace/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ace",
"version": "8.0.0",
"version": "8.0.1",
"maintainers": "Johnny Willemsen <[email protected]>",
"description": "The ADAPTIVE Communication Environment",
"homepage": "https://github.com/DOCGroup/ACE_TAO",
Expand Down
4 changes: 2 additions & 2 deletions ports/activemq-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "activemq-cpp",
"version-semver": "3.9.5",
"port-version": 16,
"port-version": 17,
"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
"license": "Apache-2.0",
"supports": "!(uwp | osx)",
"supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
"dependencies": [
"apr",
{
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ada-url/ada
REF "v${VERSION}"
SHA512 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b
SHA512 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6
HEAD_REF main
PATCHES
no-cpm.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/ada-url/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ada-url",
"version": "2.9.1",
"version": "2.9.2",
"description": "WHATWG-compliant and fast URL parser written in modern C++",
"homepage": "https://ada-url.com/",
"license": "MIT",
Expand Down
9 changes: 7 additions & 2 deletions ports/aklomp-base64/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aklomp/base64
REF "v${VERSION}"
SHA512 d63c6b36c99abcdfadf3730096c3a7cd36593526dd3dae815035ce196d3354ece7da1d92ecec800a81e1ab5e1d878b24f0b1de62b7aca516170d06a07c1b42a2
SHA512 9f8ca8a6e9feb8ad98158d675ec3331e83c77401d2633de0e43b62e794682a9d63c03e1c2599981ad3cdb249e263964f6a79084dbdf2ca19a1e1eed6195a98f4
HEAD_REF master
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBASE64_BUILD_CLI=OFF
-DBASE64_REGENERATE_TABLES=OFF
-DBASE64_WERROR=OFF
-DBASE64_WITH_OpenMP=OFF
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion ports/aklomp-base64/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aklomp-base64",
"version": "0.5.1",
"version": "0.5.2",
"description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration",
"homepage": "https://github.com/aklomp/base64",
"license": "BSD-2-Clause",
Expand Down
30 changes: 0 additions & 30 deletions ports/alembic/fix-runtime-destination.patch

This file was deleted.

4 changes: 1 addition & 3 deletions ports/alembic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alembic/alembic
REF "${VERSION}"
SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
SHA512 510cc85346b685833091cd616ad6d8a3ba602e716747ab8dea6573abbaa1a2d49eed80b2d566b68293df78f3f3b9cf412ff4e3515f0d37951d63b9634b207a08
HEAD_REF master
PATCHES
fix-runtime-destination.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion ports/alembic/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alembic",
"version": "1.8.6",
"version": "1.8.7",
"description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
"homepage": "https://alembic.io/",
"supports": "!(windows & x86) & !uwp",
Expand Down
66 changes: 66 additions & 0 deletions ports/aliyun-oss-cpp-sdk/0001-dependency-and-targets.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea0d8d6..2a853a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,8 +78,8 @@ if (${TARGET_OS} STREQUAL "WINDOWS")
set(CLIENT_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/third_party/include)
else()
- include(FindCURL)
- include(FindOpenSSL)
+ find_package(CURL CONFIG REQUIRED)
+ find_package(OpenSSL CONFIG REQUIRED)

if(NOT CURL_FOUND)
message(FATAL_ERROR "Could not find curl")
diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt
index 28d04c2..d5d715d 100644
--- a/sdk/CMakeLists.txt
+++ b/sdk/CMakeLists.txt
@@ -146,6 +146,13 @@ set_target_properties(${PROJECT_NAME}${STATIC_LIB_SUFFIX}
OUTPUT_NAME ${TARGET_OUTPUT_NAME_PREFIX}${PROJECT_NAME}${STATIC_LIB_SUFFIX}
)

+target_include_directories(${PROJECT_NAME}${STATIC_LIB_SUFFIX}
+ PUBLIC $<INSTALL_INTERFACE:include>
+)
+
+target_link_libraries(${PROJECT_NAME}${STATIC_LIB_SUFFIX} ${CRYPTO_LIBS})
+target_link_libraries(${PROJECT_NAME}${STATIC_LIB_SUFFIX} ${CLIENT_LIBS})
+
target_include_directories(${PROJECT_NAME}${STATIC_LIB_SUFFIX}
PRIVATE include
PRIVATE include/alibabacloud/oss
@@ -173,6 +180,9 @@ if (BUILD_SHARED_LIBS)
OUTPUT_NAME ${TARGET_OUTPUT_NAME_PREFIX}${PROJECT_NAME}
)

+ target_include_directories(${PROJECT_NAME}
+ PUBLIC $<INSTALL_INTERFACE:include>
+ )
target_include_directories(${PROJECT_NAME}
PRIVATE include
PRIVATE include/alibabacloud/oss
@@ -210,16 +220,18 @@ install(FILES ${sdk_encryption_header}
install(FILES ${sdk_public_header}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/oss)

-install(TARGETS ${PROJECT_NAME}${STATIC_LIB_SUFFIX}
+install(TARGETS ${PROJECT_NAME}${STATIC_LIB_SUFFIX} EXPORT unofficial-aliyun-oss-cpp-sdk-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)

if (BUILD_SHARED_LIBS)
-install(TARGETS ${PROJECT_NAME}
+install(TARGETS ${PROJECT_NAME} EXPORT unofficial-aliyun-oss-cpp-sdk-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
-endif()
\ No newline at end of file
+endif()
+
+include(0002-unofficial-export.cmake)
26 changes: 26 additions & 0 deletions ports/aliyun-oss-cpp-sdk/0002-unofficial-export.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

install(
EXPORT unofficial-aliyun-oss-cpp-sdk-targets
NAMESPACE unofficial::aliyun-oss-cpp-sdk::
DESTINATION share/unofficial-aliyun-oss-cpp-sdk
)

file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-aliyun-oss-cpp-sdk-config.cmake.in" [[
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(CURL REQUIRED)
find_dependency(OpenSSL REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-aliyun-oss-cpp-sdk-targets.cmake")
]]
)

include(CMakePackageConfigHelpers)
configure_package_config_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-aliyun-oss-cpp-sdk-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/unofficial-aliyun-oss-cpp-sdk-config.cmake"
INSTALL_DESTINATION "share/unofficial-aliyun-oss-cpp-sdk"
)

install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/unofficial-aliyun-oss-cpp-sdk-config.cmake"
DESTINATION "share/unofficial-aliyun-oss-cpp-sdk"
)
13 changes: 13 additions & 0 deletions ports/aliyun-oss-cpp-sdk/0003-suppress-fmt-warning.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea0d8d6..2a853a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ else()
endif()

list(APPEND SDK_COMPILER_FLAGS "-Wall" "-Werror" "-pedantic" "-Wextra")
-
+ list(APPEND SDK_COMPILER_FLAGS "-Wno-error=deprecated-declarations")
if (ENABLE_COVERAGE)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage")
25 changes: 25 additions & 0 deletions ports/aliyun-oss-cpp-sdk/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aliyun/aliyun-oss-cpp-sdk
REF "${VERSION}"
SHA512 7773961ad380d28cda96e16ae6491a76e03f0cb5f0c5135b660179dd449d730e1dfffb916489ed60e13815f53566c24cd9cfd8985c468438369341358eeed3bd
HEAD_REF master
PATCHES
0001-dependency-and-targets.patch
0003-suppress-fmt-warning.patch
)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/0002-unofficial-export.cmake" DESTINATION "${SOURCE_PATH}/sdk/")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_SAMPLE=OFF
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT})

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
21 changes: 21 additions & 0 deletions ports/aliyun-oss-cpp-sdk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "aliyun-oss-cpp-sdk",
"version": "1.10.0",
"port-version": 2,
"description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.",
"homepage": "https://github.com/aliyun/aliyun-oss-cpp-sdk",
"license": "Apache-2.0",
"supports": "linux | osx | android",
"dependencies": [
"curl",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion ports/alpaka/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alpaka-group/alpaka
REF ${VERSION}
SHA512 ee5354c498c9be12f4885d08c1ab9c11e67e3c305ea90c82605e061bd1a3b4efcc1ae17fb92d0cc9c2b402e8ba44431149409d4df903a2c355c382ae07ec9bcd
SHA512 ef161c43cafaa4e6cfa8944855dbdafe260d97b23e9275716608301ffffc0f088a3f8bf2f01dc34c38639cf40fe4266e4f48126684ba824a6db6ef3c13fd873f
HEAD_REF develop
)
set(VCPKG_BUILD_TYPE release)
Expand Down
2 changes: 1 addition & 1 deletion ports/alpaka/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alpaka",
"version": "1.1.0",
"version": "1.2.0",
"description": "The alpaka library is a header-only abstraction library for accelerator development",
"homepage": "https://github.com/alpaka-group/alpaka",
"license": "MPL-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/amd-amf/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GPUOpen-LibrariesAndSDKs/AMF
REF "v${VERSION}"
SHA512 e0c4f583996ff2d1d61c53b8ce7ef2eadb32d2a13930e59146b935840e31d032c5cec48baced70b0007fa5f33e30537d03ddf71140ff51213085aba20e16f5ca
SHA512 8a2aa3a358a7c0cfac47f545b8a375de86652d6590795161ad592e49219f54f5ec8dd06d5d48ea9e091fac09e83dbac2044d7ed551898f907cc1b30eea66b7ab
HEAD_REF master
)

Expand Down
3 changes: 1 addition & 2 deletions ports/amd-amf/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "amd-amf",
"version": "1.4.33",
"port-version": 1,
"version": "1.4.35",
"description": "AMD Advanced Media Framework headers",
"homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/AMF",
"license": "MIT",
Expand Down
13 changes: 13 additions & 0 deletions ports/ampl-asl/0006-disable-generate-arith-h.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d4b65e..21b32ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,7 +104,7 @@ file(WRITE ${GENERATED_INCLUDE_DIR}/details.c "${DETAILS}")
configure_file(${SRCDIR}/solvers/stdio1.h0 ${GENERATED_INCLUDE_DIR}/stdio1.h
COPYONLY)

-if(CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "^x86")
+if(0)
include(CheckTypeSize)
check_type_size(double DOUBLE_SIZE)
check_type_size(long LONG_SIZE)
59 changes: 0 additions & 59 deletions ports/ampl-asl/copyright

This file was deleted.

Loading

0 comments on commit 4947417

Please sign in to comment.