From 7b87ea1c85357c7cea6303147b21fc15a3d9bd0b Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Tue, 26 Apr 2022 12:09:03 +0800 Subject: [PATCH] some small fixes on Storage cmakefiles (#3588) --- cmake-modules/FolderList.cmake | 4 ++-- sdk/storage/azure-storage-blobs/CMakeLists.txt | 8 ++++---- sdk/storage/azure-storage-common/CMakeLists.txt | 2 +- sdk/storage/azure-storage-files-datalake/CMakeLists.txt | 6 +++--- sdk/storage/azure-storage-files-shares/CMakeLists.txt | 6 +++--- sdk/storage/azure-storage-queues/CMakeLists.txt | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmake-modules/FolderList.cmake b/cmake-modules/FolderList.cmake index 52de3985c..8c3685b43 100644 --- a/cmake-modules/FolderList.cmake +++ b/cmake-modules/FolderList.cmake @@ -17,11 +17,11 @@ macro(GetFolderList project) elseif(${project} STREQUAL STORAGE_BLOBS) DownloadDepVersion(sdk/core azure-core 1.5.0) DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.3) - elseif(${project} STREQUAL STORAGE_DATALAKE) + elseif(${project} STREQUAL STORAGE_FILES_DATALAKE) DownloadDepVersion(sdk/core azure-core 1.3.1) DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2) DownloadDepVersion(sdk/storage/azure-storage-blobs azure-storage-blobs 12.3.0) - elseif(${project} STREQUAL STORAGE_SHARES) + elseif(${project} STREQUAL STORAGE_FILES_SHARES) DownloadDepVersion(sdk/core azure-core 1.3.1) DownloadDepVersion(sdk/storage/azure-storage-common azure-storage-common 12.2.2) elseif(${project} STREQUAL STORAGE_QUEUES) diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index 122ad8b76..3813f7033 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -39,7 +39,7 @@ elseif(NOT AZ_ALL_LIBRARIES) endif() set( - AZURE_STORAGE_BLOB_HEADER + AZURE_STORAGE_BLOBS_HEADER inc/azure/storage/blobs/append_blob_client.hpp inc/azure/storage/blobs/blob_client.hpp inc/azure/storage/blobs/blob_container_client.hpp @@ -53,11 +53,11 @@ set( inc/azure/storage/blobs/page_blob_client.hpp inc/azure/storage/blobs/rest_client.hpp inc/azure/storage/blobs.hpp + src/private/package_version.hpp ) set( - AZURE_STORAGE_BLOB_SOURCE - src/private/package_version.hpp + AZURE_STORAGE_BLOBS_SOURCE src/append_blob_client.cpp src/blob_client.cpp src/blob_container_client.cpp @@ -70,7 +70,7 @@ set( src/rest_client.cpp ) -add_library(azure-storage-blobs ${AZURE_STORAGE_BLOB_HEADER} ${AZURE_STORAGE_BLOB_SOURCE}) +add_library(azure-storage-blobs ${AZURE_STORAGE_BLOBS_HEADER} ${AZURE_STORAGE_BLOBS_SOURCE}) create_per_service_target_build(storage azure-storage-blobs) # make sure that users can consume the project as a library. diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index 2e1f73e87..40b36839d 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -58,11 +58,11 @@ set( inc/azure/storage/common/storage_common.hpp inc/azure/storage/common/storage_credential.hpp inc/azure/storage/common/storage_exception.hpp + src/private/package_version.hpp ) set( AZURE_STORAGE_COMMON_SOURCE - src/private/package_version.hpp src/account_sas_builder.cpp src/crypt.cpp src/file_io.cpp diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index 0bb94e259..39c63a306 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -25,8 +25,8 @@ az_vcpkg_integrate() if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) include(FolderList) - SetCompileOptions(STORAGE_DATALAKE) - GetFolderList(STORAGE_DATALAKE) + SetCompileOptions(STORAGE_FILES_DATALAKE) + GetFolderList(STORAGE_FILES_DATALAKE) foreach(oneFolder IN LISTS BUILD_FOLDERS) message("add folder ${oneFolder}") add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL) @@ -52,13 +52,13 @@ set( inc/azure/storage/files/datalake/datalake_service_client.hpp inc/azure/storage/files/datalake/dll_import_export.hpp inc/azure/storage/files/datalake/rest_client.hpp + src/private/package_version.hpp ) set( AZURE_STORAGE_FILES_DATALAKE_SOURCE src/private/datalake_constants.hpp src/private/datalake_utilities.hpp - src/private/package_version.hpp src/datalake_directory_client.cpp src/datalake_file_client.cpp src/datalake_file_system_client.cpp diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index 884c5ccbf..e268010b1 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -25,8 +25,8 @@ az_vcpkg_integrate() if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) include(FolderList) - SetCompileOptions(STORAGE_SHARES) - GetFolderList(STORAGE_SHARES) + SetCompileOptions(STORAGE_FILES_SHARES) + GetFolderList(STORAGE_FILES_SHARES) foreach(oneFolder IN LISTS BUILD_FOLDERS) message("add folder ${oneFolder}") add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL) @@ -52,11 +52,11 @@ set( inc/azure/storage/files/shares/share_sas_builder.hpp inc/azure/storage/files/shares/share_service_client.hpp inc/azure/storage/files/shares.hpp + src/private/package_version.hpp ) set( AZURE_STORAGE_FILES_SHARES_SOURCE - src/private/package_version.hpp src/rest_client.cpp src/share_client.cpp src/share_directory_client.cpp diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt index 1392c4748..b4d779879 100644 --- a/sdk/storage/azure-storage-queues/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/CMakeLists.txt @@ -39,7 +39,7 @@ elseif(NOT AZ_ALL_LIBRARIES) endif() set( - AZURE_STORAGE_QUEUE_HEADER + AZURE_STORAGE_QUEUES_HEADER inc/azure/storage/queues.hpp inc/azure/storage/queues/dll_import_export.hpp inc/azure/storage/queues/queue_client.hpp @@ -48,11 +48,11 @@ set( inc/azure/storage/queues/queue_sas_builder.hpp inc/azure/storage/queues/queue_service_client.hpp inc/azure/storage/queues/rest_client.hpp + src/private/package_version.hpp ) set( - AZURE_STORAGE_QUEUE_SOURCE - src/private/package_version.hpp + AZURE_STORAGE_QUEUES_SOURCE src/queue_client.cpp src/queue_options.cpp src/queue_responses.cpp @@ -61,7 +61,7 @@ set( src/rest_client.cpp ) -add_library(azure-storage-queues ${AZURE_STORAGE_QUEUE_HEADER} ${AZURE_STORAGE_QUEUE_SOURCE}) +add_library(azure-storage-queues ${AZURE_STORAGE_QUEUES_HEADER} ${AZURE_STORAGE_QUEUES_SOURCE}) create_per_service_target_build(storage azure-storage-queues) # make sure that users can consume the project as a library. add_library(Azure::azure-storage-queues ALIAS azure-storage-queues)