-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
add azure-storage-cpp/7.5.0 #5605
add azure-storage-cpp/7.5.0 #5605
Conversation
This comment has been minimized.
This comment has been minimized.
e44cac9
to
c271eaf
Compare
This comment has been minimized.
This comment has been minimized.
same issue as in #5570 (comment) |
This comment has been minimized.
This comment has been minimized.
Ping us when this happens... we can trigger a build to generate these missing packages behind the scenes... if we realize about it. It should be better now that the CI will send us a message: #5614 |
Thanks @jgsogo . Is |
This comment has been minimized.
This comment has been minimized.
c271eaf
to
4f1227b
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
all errors now are |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some minor suggestions
- find_package(LibXML2 REQUIRED) | ||
+ find_package(libuuid REQUIRED) | ||
+ find_package(cpprestsdk REQUIRED) | ||
+ find_package(LibXml2 REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the one exposed by conan wrong?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, upstream library uses its own find modules: https://github.com/Azure/azure-storage-cpp/tree/master/Microsoft.WindowsAzure.Storage/cmake/Modules
set(AZURESTORAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/includes) | ||
-set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${LibXML2_INCLUDE_DIR}) | ||
+set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${cpprestsdk_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OpenSSL_INCLUDE_DIRS} ${libuuid_INCLUDE_DIRS} ${LibXml2_INCLUDE_DIR}) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we not use cmake targets?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could but it would require patching more files and this one seems to work.
I prefer to keep the patch minimal if that's ok.
def build(self): | ||
cmake = CMake(self) | ||
if not self.settings.compiler.cppstd: | ||
cmake.definitions["CMAKE_CXX_STANDARD"] = 11 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could be move to the cmake since it the test package
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will do
This comment has been minimized.
This comment has been minimized.
3d69517
to
cd64d3e
Compare
This comment has been minimized.
This comment has been minimized.
self.cpp_info.names["cmake_find_package"] = "AzureStorage" | ||
self.cpp_info.names["cmake_find_package_multi"] = "AzureStorage" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where does it come from? I don't see official Find/config files upstream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
copy-paste leftovers, will remove
|
||
self.cpp_info.libs = tools.collect_libs(self) | ||
if self.settings.os == "Windows": | ||
self.cpp_info.system_libs = ["Ws2_32", "rpcrt4", "xmllite", "bcrypt"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
self.cpp_info.system_libs = ["Ws2_32", "rpcrt4", "xmllite", "bcrypt"] | |
self.cpp_info.system_libs = ["ws2_32", "rpcrt4", "xmllite", "bcrypt"] |
lowercase windows system libs for mingw@linux
self.requires("cpprestsdk/2.10.18") | ||
if self.settings.os != "Windows": | ||
self.requires("libxml2/2.9.10") | ||
self.requires("libuuid/1.0.3") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
self.requires("cpprestsdk/2.10.18") | |
if self.settings.os != "Windows": | |
self.requires("libxml2/2.9.10") | |
self.requires("libuuid/1.0.3") | |
self.requires("cpprestsdk/2.10.18") | |
if self.settings.os != "Windows": | |
self.requires("boost/1.76.0") | |
self.requires("libxml2/2.9.10") | |
self.requires("libuuid/1.0.3") |
Boost is a direct dependency for non-Windows: https://github.com/Azure/azure-storage-cpp/blob/5b1c1597e6a637bc205d91342054814c8d901777/Microsoft.WindowsAzure.Storage/CMakeLists.txt#L21-L22
Don't rely on transitive dependencies coming from cpprestsdk.
All green in build 26 (
|
Specify library name and version: azure-storage-cpp/7.5.0
conan-center hook activated.