-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into clangcltriplets
- Loading branch information
Showing
2,233 changed files
with
15,291 additions
and
12,834 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
ports/aliyun-oss-cpp-sdk/0001-dependency-and-targets.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.