Skip to content

Commit

Permalink
Update vcpkg version dependencies (#2718)
Browse files Browse the repository at this point in the history
  • Loading branch information
antkmsft authored Aug 9, 2021
1 parent 650a74c commit 6bf52bd
Show file tree
Hide file tree
Showing 26 changed files with 35 additions and 47 deletions.
1 change: 0 additions & 1 deletion sdk/core/azure-core/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "openssl",
Expand Down
4 changes: 1 addition & 3 deletions sdk/identity/azure-identity/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/identity/azure-identity",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.2.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.1.0" CONFIG QUIET)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.1.0" REQUIRED)
find_package(azure-core-cpp "1.2.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp)
find_dependency(azure-core-cpp "1.2.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-common-cppTargets.cmake")

Expand Down
4 changes: 1 addition & 3 deletions sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-common",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.1.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.1.0" CONFIG QUIET)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.1.0" REQUIRED)
find_package(azure-core-cpp "1.2.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp)
find_dependency(azure-core-cpp "1.2.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-keys-cppTargets.cmake")

Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.1.0" CONFIG QUIET)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.1.0" REQUIRED)
find_package(azure-core-cpp "1.2.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp "1.2.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-secrets-cppTargets.cmake")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-secrets",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-blobs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.0.0" CONFIG QUIET)
find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.0.0" REQUIRED)
find_package(azure-storage-common-cpp "12.1.0" REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-storage-common-cpp)
find_dependency(azure-storage-common-cpp "12.1.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-blobs-cppTargets.cmake")

Expand Down
4 changes: 1 addition & 3 deletions sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-storage-common-cpp",
"default-features": false,
"version>=": "12.0.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
include(CMakeFindDependencyMacro)
find_dependency(LibXml2)
find_dependency(Threads)
find_dependency(azure-core-cpp)
find_dependency(azure-core-cpp "1.0.0")

if(NOT WIN32)
find_dependency(OpenSSL)
Expand Down
4 changes: 1 addition & 3 deletions sdk/storage/azure-storage-common/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.0.0"
"default-features": false
},
"libxml2",
{
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-files-datalake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-blobs-cpp "12.0.0" CONFIG QUIET)
find_package(azure-storage-blobs-cpp "12.1.0" CONFIG QUIET)
if(NOT azure-storage-blobs-cpp_FOUND)
find_package(azure-storage-blobs-cpp "12.0.0" REQUIRED)
find_package(azure-storage-blobs-cpp "12.1.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-storage-blobs-cpp)
find_dependency(azure-storage-blobs-cpp "12.1.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-datalake-cppTargets.cmake")

Expand Down
4 changes: 1 addition & 3 deletions sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-storage-blobs-cpp",
"default-features": false,
"version>=": "12.0.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-files-shares/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.0.0" CONFIG QUIET)
find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.0.0" REQUIRED)
find_package(azure-storage-common-cpp "12.1.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-storage-common-cpp)
find_dependency(azure-storage-common-cpp "12.1.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-files-shares-cppTargets.cmake")

Expand Down
4 changes: 1 addition & 3 deletions sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-storage-common-cpp",
"default-features": false,
"version>=": "12.0.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-queues/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ include(AzureGlobalCompileOptions)
az_vcpkg_integrate()

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.0.0" CONFIG QUIET)
find_package(azure-storage-common-cpp "12.1.0" CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.0.0" REQUIRED)
find_package(azure-storage-common-cpp "12.1.0" REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-storage-common-cpp)
find_dependency(azure-storage-common-cpp "12.1.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-storage-queues-cppTargets.cmake")

Expand Down
3 changes: 1 addition & 2 deletions sdk/storage/azure-storage-queues/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"dependencies": [
{
"name": "azure-storage-common-cpp",
"default-features": false,
"version>=": "12.0.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion sdk/template/azure-template/vcpkg/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp)
find_dependency(azure-core-cpp "1.0.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-template-cppTargets.cmake")

Expand Down
4 changes: 1 addition & 3 deletions sdk/template/azure-template/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/template/azure-template",
"license": "MIT",
"builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.0.0"
"default-features": false
},
{
"name": "vcpkg-cmake",
Expand Down

0 comments on commit 6bf52bd

Please sign in to comment.