Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up version requirements #4814

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Clean up version requirements #4814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
facb8ee
Clean up version requirements
antkmsft Jul 20, 2023
d064c85
Revert curl back to 7.44
antkmsft Jul 20, 2023
b5b3680
Update vcpkg.json
antkmsft Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/attestation/azure-security-attestation/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.8.0")
find_dependency(azure-core-cpp)
find_dependency(OpenSSL)

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-attestation-cppTargets.cmake")
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core-tracing-opentelemetry/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.8.0")
find_dependency(azure-core-cpp)
find_dependency(Threads)

find_dependency(opentelemetry-cpp)
Expand Down
7 changes: 2 additions & 5 deletions sdk/core/azure-core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,9 @@ include(CreateMapFile)
find_package(Threads REQUIRED)

if(BUILD_TRANSPORT_CURL)
# min version for `CURLSSLOPT_NO_REVOKE`
# https://curl.haxx.se/libcurl/c/CURLOPT_SSL_OPTIONS.html
set(CURL_MIN_REQUIRED_VERSION 7.44)
find_package(CURL ${CURL_MIN_REQUIRED_VERSION} CONFIG QUIET)
find_package(CURL CONFIG QUIET)
antkmsft marked this conversation as resolved.
Show resolved Hide resolved
if(NOT CURL_FOUND)
find_package(CURL ${CURL_MIN_REQUIRED_VERSION} REQUIRED)
find_package(CURL REQUIRED)
endif()
message("Libcurl version ${CURL_VERSION_STRING}")
endif()
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/azure-core/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"default-features": false,
"features": [
"ssl"
]
],
"version>=": "7.44"
antkmsft marked this conversation as resolved.
Show resolved Hide resolved
Comment on lines +38 to +39
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change resulted in 7.44 showing up here:
microsoft/vcpkg#32971

And looks like the oldest version of curl listed in the version databse within he catalog is 7.48:
https://github.com/microsoft/vcpkg/blob/master/versions/c-/curl.json#L425

So, to make that work, we got bumped up by vcpkg, here:
microsoft/vcpkg#33109

}
]
},
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/vcpkg/Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro)
find_dependency(Threads)

if(@BUILD_TRANSPORT_CURL@)
find_dependency(CURL @CURL_MIN_REQUIRED_VERSION@)
find_dependency(CURL)
endif()

if(@BUILD_TRANSPORT_WINHTTP@)
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/azure-core/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
"default-features": false,
"features": [
"ssl"
]
],
"version>=": "7.44"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/azure-identity/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.9.0")
find_dependency(azure-core-cpp)

find_dependency(OpenSSL)

Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder})
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.7.2" CONFIG QUIET)
antkmsft marked this conversation as resolved.
Show resolved Hide resolved
find_package(azure-core-cpp CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.7.2" REQUIRED)
find_package(azure-core-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-administration/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.9.0")
find_dependency(azure-core-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
find_package(azure-core-cpp CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.5.0" REQUIRED)
find_package(azure-core-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.9.0")
find_dependency(azure-core-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
find_package(azure-core-cpp CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.5.0" REQUIRED)
find_package(azure-core-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-keys/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.9.0")
find_dependency(azure-core-cpp)

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder})
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
find_package(azure-core-cpp CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.5.0" REQUIRED)
find_package(azure-core-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-secrets/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.9.0")
find_dependency(azure-core-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-blobs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.3.1" CONFIG QUIET)
find_package(azure-storage-common-cpp CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.3.1" REQUIRED)
find_package(azure-storage-common-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-blobs/vcpkg/Config.cmake.in
View file
Open in desktop
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 "12.3.1")
find_dependency(azure-storage-common-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.9.0" CONFIG QUIET)
find_package(azure-core-cpp CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.9.0" REQUIRED)
find_package(azure-core-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

include(CMakeFindDependencyMacro)
find_dependency(Threads)
find_dependency(azure-core-cpp "1.9.0")
find_dependency(azure-core-cpp)

if(NOT WIN32)
find_dependency(LibXml2)
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-files-datalake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-blobs-cpp "12.7.0" CONFIG QUIET)
find_package(azure-storage-blobs-cpp CONFIG QUIET)
if(NOT azure-storage-blobs-cpp_FOUND)
find_package(azure-storage-blobs-cpp "12.7.0" REQUIRED)
find_package(azure-storage-blobs-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-files-datalake/vcpkg/Config.cmake.in
View file
Open in desktop
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 "12.7.0")
find_dependency(azure-storage-blobs-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-files-shares/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.3.2" CONFIG QUIET)
find_package(azure-storage-common-cpp CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.3.2" REQUIRED)
find_package(azure-storage-common-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-files-shares/vcpkg/Config.cmake.in
View file
Open in desktop
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 "12.3.2")
find_dependency(azure-storage-common-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-queues/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-storage-common-cpp "12.2.3" CONFIG QUIET)
find_package(azure-storage-common-cpp CONFIG QUIET)
if(NOT azure-storage-common-cpp_FOUND)
find_package(azure-storage-common-cpp "12.2.3" REQUIRED)
find_package(azure-storage-common-cpp REQUIRED)
endif()
endif()

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure-storage-queues/vcpkg/Config.cmake.in
View file
Open in desktop
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 "12.2.3")
find_dependency(azure-storage-common-cpp)

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

Expand Down
4 changes: 2 additions & 2 deletions sdk/template/azure-template/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ include(CreateMapFile)


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

Expand Down
2 changes: 1 addition & 1 deletion sdk/template/azure-template/vcpkg/Config.cmake.in
View file
Open in desktop
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 "1.3.1")
find_dependency(azure-core-cpp)

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

Expand Down