-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'microsoft:master' into oniguruma
- Loading branch information
Showing
327 changed files
with
1,910 additions
and
3,419 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 |
---|---|---|
@@ -0,0 +1,23 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index d16eec6..92146f4 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -87,13 +87,17 @@ STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PAT | ||
|
||
CONFIGURE_FILE(include/apr.hwc | ||
${PROJECT_BINARY_DIR}/apr.h) | ||
|
||
ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c) | ||
|
||
+set(UNOFFICIAL_APR_HOST_TOOLS_DIR "$<TARGET_FILE_DIR:gen_test_char>" CACHE STRING "") | ||
+set(UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX "$<TARGET_PROPERTY:gen_test_char,SUFFIX>" CACHE STRING "") | ||
+install(TARGETS gen_test_char) | ||
+ | ||
ADD_CUSTOM_COMMAND( | ||
COMMENT "Generating character tables, apr_escape_test_char.h, for current locale" | ||
DEPENDS gen_test_char | ||
- COMMAND $<TARGET_FILE:gen_test_char> > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h | ||
+ COMMAND "${UNOFFICIAL_APR_HOST_TOOLS_DIR}/gen_test_char${UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX}" > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h | ||
OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h | ||
) | ||
ADD_CUSTOM_TARGET( |
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,41 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index b18407f..f1be4c0 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -52,9 +52,6 @@ FetchContent_Declare( | ||
# For Windows: Prevent overriding the parent project's compiler/linker settings | ||
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) | ||
|
||
-FetchContent_MakeAvailable(googletest) | ||
-include(GoogleTest) | ||
- | ||
add_subdirectory(au) | ||
|
||
# Configure how Au will be installed. | ||
diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in | ||
index b121f76..65da38a 100644 | ||
--- a/cmake/AuConfig.cmake.in | ||
+++ b/cmake/AuConfig.cmake.in | ||
@@ -14,9 +14,6 @@ | ||
|
||
@PACKAGE_INIT@ | ||
|
||
-include(CMakeFindDependencyMacro) | ||
-find_dependency(googletest 1.12.1) | ||
- | ||
include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake) | ||
|
||
check_required_components(Au) | ||
diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake | ||
index 28daf00..f2bf389 100644 | ||
--- a/cmake/HeaderOnlyLibrary.cmake | ||
+++ b/cmake/HeaderOnlyLibrary.cmake | ||
@@ -75,7 +75,7 @@ function(header_only_library) | ||
) | ||
|
||
# Add the test, if requested. | ||
- if (DEFINED ARG_GTEST_SRCS) | ||
+ if (0) | ||
add_executable("${ARG_NAME}_test") | ||
target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS}) | ||
target_link_libraries( |
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,23 @@ | ||
set(VCPKG_BUILD_TYPE release) # header-only | ||
|
||
vcpkg_from_github( | ||
OUT_SOURCE_PATH SOURCE_PATH | ||
REPO aurora-opensource/au | ||
REF "${VERSION}" | ||
SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374 | ||
HEAD_REF main | ||
PATCHES | ||
disable-googletest.patch | ||
) | ||
|
||
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") | ||
vcpkg_cmake_install() | ||
|
||
vcpkg_cmake_config_fixup( | ||
CONFIG_PATH lib/cmake/Au | ||
) | ||
|
||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") | ||
|
||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Remove empty directory | ||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") |
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,4 @@ | ||
The package aurora-au provides CMake targets: | ||
|
||
find_package(Au REQUIRED) | ||
target_link_libraries(main PRIVATE Au::au) |
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,19 @@ | ||
{ | ||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | ||
"name": "aurora-au", | ||
"version-semver": "0.3.5", | ||
"description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.", | ||
"homepage": "https://github.com/aurora-opensource/au", | ||
"license": "Apache-2.0", | ||
"supports": "!osx", | ||
"dependencies": [ | ||
{ | ||
"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
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,12 @@ | ||
diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt | ||
index 3ef7bf8d9..6d2829e84 100644 | ||
--- a/sdk/core/azure-core-amqp/CMakeLists.txt | ||
+++ b/sdk/core/azure-core-amqp/CMakeLists.txt | ||
@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE | ||
PUBLIC Azure::azure-core) | ||
|
||
get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") | ||
+set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) | ||
generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION}) | ||
|
||
az_vcpkg_export( |
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 |
---|---|---|
|
@@ -9,6 +9,7 @@ vcpkg_from_github( | |
HEAD_REF main | ||
PATCHES | ||
useragent.patch | ||
set_version.patch | ||
) | ||
|
||
vcpkg_check_features( | ||
|
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,12 @@ | ||
diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt | ||
index 87c5cfd9b..c7d29c3f2 100644 | ||
--- a/sdk/core/azure-core/CMakeLists.txt | ||
+++ b/sdk/core/azure-core/CMakeLists.txt | ||
@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP) | ||
endif() | ||
|
||
get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") | ||
+set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) | ||
generate_documentation(azure-core ${AZ_LIBRARY_VERSION}) | ||
|
||
az_vcpkg_export( |
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
13 changes: 13 additions & 0 deletions
13
ports/azure-core-tracing-opentelemetry-cpp/set_version.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,13 @@ | ||
diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | ||
index 23cf7d143..a3c058874 100644 | ||
--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | ||
+++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | ||
@@ -83,6 +83,8 @@ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") | ||
generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION}) | ||
|
||
if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) | ||
+ set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) | ||
+ | ||
az_vcpkg_export( | ||
azure-core-tracing-opentelemetry | ||
CORE_TRACING_OPENTELEMETRY |
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,12 @@ | ||
diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt | ||
index 038e267d7..f3b5e679c 100644 | ||
--- a/sdk/tables/azure-data-tables/CMakeLists.txt | ||
+++ b/sdk/tables/azure-data-tables/CMakeLists.txt | ||
@@ -106,6 +106,7 @@ target_include_directories( | ||
target_link_libraries(azure-data-tables PUBLIC Azure::azure-core) | ||
|
||
get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") | ||
+set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) | ||
generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION}) | ||
|
||
az_vcpkg_export( |
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,12 @@ | ||
diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt | ||
index 57fe6bbc2..2cd8243ac 100644 | ||
--- a/sdk/identity/azure-identity/CMakeLists.txt | ||
+++ b/sdk/identity/azure-identity/CMakeLists.txt | ||
@@ -117,6 +117,7 @@ else() | ||
endif() | ||
|
||
get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") | ||
+set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) | ||
generate_documentation(azure-identity ${AZ_LIBRARY_VERSION}) | ||
|
||
az_vcpkg_export( |
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
Oops, something went wrong.