Mercurial > hg > orthanc-object-storage

changeset 101:57be7094d6c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated Google plugin for latest SDK
author Alain Mazy <am@osimis.io>
date Thu, 20 Jul 2023 16:14:39 +0200
parents 16f0abc677c5
children 56556fffa405
files Azure/CMakeLists.txt Google/CMakeLists.txt README.md
diffstat 3 files changed, 19 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Azure/CMakeLists.txt	Thu Jul 20 15:58:17 2023 +0200
+++ b/Azure/CMakeLists.txt	Thu Jul 20 16:14:39 2023 +0200
@@ -84,7 +84,7 @@
 # endif()
 
 # include_directories(${WASTORAGE_INCLUDE_DIR})
-set (CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 14)
 
 set(COMMON_SOURCES
     ${CMAKE_SOURCE_DIR}/../Common/IStorage.h
--- a/Google/CMakeLists.txt	Thu Jul 20 15:58:17 2023 +0200
+++ b/Google/CMakeLists.txt	Thu Jul 20 16:14:39 2023 +0200
@@ -56,9 +56,11 @@
   )
 
 find_package(CURL REQUIRED)
-find_package(storage_client REQUIRED)
+find_package(google_cloud_cpp_storage REQUIRED)
 find_package(cryptopp CONFIG REQUIRED)
 
+set(CMAKE_CXX_STANDARD 14)
+
 set(COMMON_SOURCES
     ${CMAKE_SOURCE_DIR}/../Common/IStorage.h
     ${CMAKE_SOURCE_DIR}/../Common/BaseStorage.h
@@ -91,8 +93,10 @@
 
 target_link_libraries(OrthancGoogleCloudStorage
   PRIVATE
-  storage_client
-  cryptopp-static
+  CURL::libcurl 
+  google-cloud-cpp::storage 
+  google-cloud-cpp::experimental-storage-grpc
+  cryptopp::cryptopp
   )
 
 add_executable(UnitTests
@@ -106,7 +110,9 @@
 
 target_link_libraries(UnitTests
   PRIVATE
-  cryptopp-static
-  storage_client
+  CURL::libcurl 
+  google-cloud-cpp::storage 
+  google-cloud-cpp::experimental-storage-grpc
+  cryptopp::cryptopp
   ${GOOGLE_TEST_LIBRARIES}
   )
--- a/README.md	Thu Jul 20 15:58:17 2023 +0200
+++ b/README.md	Thu Jul 20 16:14:39 2023 +0200
@@ -26,7 +26,9 @@
 
 ### Compile Google plugin ###
 
-* `./vcpkg install google-cloud-cpp`
+On Linux, with vcpkg version `2023.06.20`:
+
+* `./vcpkg install google-cloud-cpp[storage]`
 * `./vcpkg install cryptopp`
 * `hg clone ...`
 * `mkdir -p build/google`
@@ -55,19 +57,18 @@
 
 ### Compile Azure plugin ###
 
-On Linux, with vcpkg version `2022.11.14`:
+On Linux, with vcpkg version `2023.06.20`:
 
-* `./vcpkg install cpprestsdk`
+* `./vcpkg install azure-core-cpp azure-storage-blobs-cpp`
 * `./vcpkg install cryptopp`
 * `hg clone ...`
 * `mkdir -p build/azure`
 * `cd build/azure` 
 * `cmake -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake ../../orthanc-object-storage/Azure`
 
-On Windows, with vcpkg version `2022.11.14` :
+On Windows, with vcpkg version `2023.06.20` :
 
-* `.\vcpkg.exe install cpprestsdk:x64-windows-static`
-* `.\vcpkg.exe install azure-storage-cpp:x64-windows-static`
+* `.\vcpkg.exe install azure-storage-blobs-cpp:x64-windows-static`
 * `.\vcpkg.exe install cryptopp:x64-windows-static`
 * `hg clone ...`
 * `mkdir -p build/azure`