github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Vcpkg-related fixes for checkpointstore-blob (#4998)

Browse Source 
* checkpointstore-blob vcpkg dependency fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update FolderList.cmake
This commit is contained in:
Anton Kolesnyk 2023-10-02 17:35:16 -07:00 committed by GitHub
parent 35e42b99cf
commit be478542fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-modules/FolderList.cmake
View File

@ -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)

22
sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt
View File

@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
$<INSTALL_INTERFACE:include>
)
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
)

2
sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/test/ut/CMakeLists.txt
View File

@ -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

2
sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json
View File

@ -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"
},