From be478542fba6091385afb2c1791eafcecf8b1ad7 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:35:16 -0700 Subject: [PATCH] Vcpkg-related fixes for checkpointstore-blob (#4998) * checkpointstore-blob vcpkg dependency fix * Update CMakeLists.txt * Update CMakeLists.txt * Update FolderList.cmake --- cmake-modules/FolderList.cmake | 2 +- .../CMakeLists.txt | 22 +++++++++---------- .../test/ut/CMakeLists.txt | 2 +- .../vcpkg/vcpkg.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmake-modules/FolderList.cmake b/cmake-modules/FolderList.cmake index bb47e2481e..c6707e2ed4 100644 --- a/cmake-modules/FolderList.cmake +++ b/cmake-modules/FolderList.cmake @@ -33,7 +33,7 @@ macro(GetFolderList project) elseif(${project} STREQUAL EVENTHUBS) DownloadDepVersion(sdk/core azure-core 1.10.1) DownloadDepVersion(sdk/core azure-core-amqp 1.0.0-beta.1) - elseif(${project} STREQUAL EVENTHUBS_CHECKPOINT_BLOB) + elseif(${project} STREQUAL EVENTHUBS_CHECKPOINTSTORE_BLOB) DownloadDepVersion(sdk/core azure-core 1.10.1) DownloadDepVersion(sdk/core azure-core-amqp 1.0.0-beta.1) DownloadDepVersion(sdk/eventhubs azure-messaging-eventhubs 1.0.0-beta.3) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt index 54e8dfafef..f776b3a94a 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt @@ -7,7 +7,7 @@ include(AzureVcpkg) az_vcpkg_integrate() cmake_minimum_required (VERSION 3.13) -project(azure-messaging-eventhubs-checkpoint-blob LANGUAGES CXX) +project(azure-messaging-eventhubs-checkpointstore-blob LANGUAGES CXX) # Compile Options option(FETCH_SOURCE_DEPS "build source dependencies" OFF) @@ -19,7 +19,7 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) include(FolderList) - SetCompileOptions(EVENTHUBS_CHECKPOINT_BLOB) + SetCompileOptions(EVENTHUBS_CHECKPOINTSTORE_BLOB) endif() include(AzureVersion) @@ -66,28 +66,28 @@ set( ) add_library( - azure-messaging-eventhubs-checkpoint-blob + azure-messaging-eventhubs-checkpointstore-blob ${AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_HEADER} ${AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_SOURCE} ) -create_per_service_target_build(eventhubs azure-messaging-eventhubs-checkpoint-blob) -add_library(Azure::azure-messaging-eventhubs-checkpoint-blob ALIAS azure-messaging-eventhubs-checkpoint-blob) +create_per_service_target_build(eventhubs azure-messaging-eventhubs-checkpointstore-blob) +add_library(Azure::azure-messaging-eventhubs-checkpointstore-blob ALIAS azure-messaging-eventhubs-checkpointstore-blob) target_include_directories( - azure-messaging-eventhubs-checkpoint-blob + azure-messaging-eventhubs-checkpointstore-blob PUBLIC $ $ ) -target_link_libraries(azure-messaging-eventhubs-checkpoint-blob +target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob PUBLIC Azure::azure-core Azure::azure-messaging-eventhubs Azure::azure-storage-blobs ) # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF -create_code_coverage(eventhubs azure-messaging-eventhubs-checkpoint-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*") +create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*") get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") -#generate_documentation(azure-messaging-eventhubs-checkpoint-blob ${AZ_LIBRARY_VERSION}) +#generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) if(BUILD_TESTING) @@ -95,13 +95,13 @@ if(BUILD_TESTING) endif() az_vcpkg_export( - azure-messaging-eventhubs-checkpoint-blob + azure-messaging-eventhubs-checkpointstore-blob MESSAGING_EVENTHUBS_CHECKPOINTSTORE_BLOB azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp ) az_rtti_setup( - azure-messaging-eventhubs-checkpoint-blob + azure-messaging-eventhubs-checkpointstore-blob MESSAGING_EVENTHUBS_CHECKPOINTSTORE_BLOB azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp ) diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt index 47e0dd046f..5674093801 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt @@ -30,7 +30,7 @@ endif() target_link_libraries( azure-messaging-eventhubs-blobstore-test PRIVATE - azure-messaging-eventhubs-checkpoint-blob + azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs azure-core-test-fw azure-identity diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json index c53ce6d0a5..c89028b4dd 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json @@ -17,7 +17,7 @@ "version>=": "1.0.0-beta.2" }, { - "name": "azure-messaging-eventhubs", + "name": "azure-messaging-eventhubs-cpp", "default-features": false, "version>=": "1.0.0-beta.2" },