Skip to content

Commit

Permalink
Ensure CMakeLists don't miss any files (#5065)
Browse files Browse the repository at this point in the history
* Ensure CMakeLists don't miss any files

---------

Co-authored-by: Anton Kolesnyk <[email protected]>
  • Loading branch information
antkmsft and antkmsft authored Oct 27, 2023
1 parent 81e23e0 commit 50c1851
Show file tree
Hide file tree
Showing 37 changed files with 173 additions and 120 deletions.
2 changes: 1 addition & 1 deletion samples/integration/cmake-fetch-content/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif()

add_executable (
application
src/main
src/main.cpp
)

# Link to Azure SDK
Expand Down
2 changes: 1 addition & 1 deletion samples/integration/vcpkg-all-smoke/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif()

add_executable (
vcpkg-all-smoke
src/main
src/main.cpp
)

# Link to Azure SDK
Expand Down
22 changes: 11 additions & 11 deletions sdk/attestation/azure-security-attestation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,37 +31,37 @@ find_package(OpenSSL REQUIRED)

set(
AZURE_ATTESTATION_HEADER
inc/azure/attestation.hpp
inc/azure/attestation/attestation_administration_client.hpp
inc/azure/attestation/attestation_client.hpp
inc/azure/attestation/attestation_client_models.hpp
inc/azure/attestation/attestation_client_options.hpp
inc/azure/attestation/dll_import_export.hpp
inc/azure/attestation/rtti.hpp
inc/azure/attestation.hpp
)

set(
AZURE_ATTESTATION_SOURCE
src/private/crypto/inc/crypto.hpp
src/private/crypto/openssl/openssl_helpers.hpp
src/private/crypto/openssl/opensslcert.cpp
src/private/crypto/openssl/opensslcert.hpp
src/private/crypto/openssl/opensslcrypto.cpp
src/private/crypto/openssl/opensslkeys.cpp
src/private/crypto/openssl/opensslkeys.hpp
src/attestation_administration_client.cpp
src/attestation_client.cpp
src/attestation_client_options.cpp
src/private/attestation_client_models_private.hpp
src/private/attestation_client_private.cpp
src/private/attestation_client_private.hpp
src/private/attestation_common_request.cpp
src/private/attestation_common_request.hpp
src/private/attestation_deserializers_private.cpp
src/private/attestation_deserializers_private.hpp
src/private/crypto/inc/crypto.hpp
src/private/crypto/openssl/openssl_helpers.hpp
src/private/crypto/openssl/opensslcert.cpp
src/private/crypto/openssl/opensslcert.hpp
src/private/crypto/openssl/opensslcrypto.cpp
src/private/crypto/openssl/opensslkeys.cpp
src/private/crypto/openssl/opensslkeys.hpp
src/private/jsonhelpers.cpp
src/private/jsonhelpers_private.hpp
src/private/package_version.hpp
src/attestation_administration_client.cpp
src/attestation_client.cpp
src/attestation_client_options.cpp
)

add_library(azure-security-attestation ${AZURE_ATTESTATION_HEADER} ${AZURE_ATTESTATION_SOURCE})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
macro (define_sample samplename)
add_executable (
attestation-${samplename}
${samplename}.cpp)
${samplename}.cpp
cryptohelpers.hpp
)

CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation-${samplename} attestation)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
macro (define_sample samplename)
add_executable (
attestation-${samplename}
${samplename}.cpp)
${samplename}.cpp
cryptohelpers.hpp
)

CREATE_PER_SERVICE_TARGET_BUILD_FOR_SAMPLE(attestation attestation-${samplename})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ include(GoogleTest)

add_executable (
azure-security-attestation-test
macro_guard.cpp
crypto_test.cpp
attestation_test.cpp
token_test.cpp
policygetset_test.cpp
attestation_collateral.cpp
attestation_collateral.cpp
attestation_metadata.cpp
policycertmgmt_test.cpp
tpmattestation_test.cpp
attestation_test.cpp
crypto_test.cpp
crypto_test_collateral.cpp
crypto_test_collateral.hpp
macro_guard.cpp
policycertmgmt_test.cpp
policygetset_test.cpp
token_test.cpp
tpmattestation_test.cpp
)

create_per_service_target_build(attestation azure-security-attestation-test)
Expand Down
34 changes: 27 additions & 7 deletions sdk/core/azure-core-amqp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,38 @@ find_package(azure_c_shared_utility CONFIG REQUIRED)


set (AZURE_CORE_AMQP_HEADER
inc/azure/core/amqp.hpp
inc/azure/core/amqp/cancellable.hpp
inc/azure/core/amqp/claims_based_security.hpp
inc/azure/core/amqp/common/async_operation_queue.hpp
inc/azure/core/amqp/common/completion_operation.hpp
inc/azure/core/amqp/common/global_state.hpp
inc/azure/core/amqp/connection.hpp
inc/azure/core/amqp/connection_string_credential.hpp
inc/azure/core/amqp/connection.hpp
inc/azure/core/amqp/dll_import_export.hpp
inc/azure/core/amqp/doxygen_pragma.hpp
inc/azure/core/amqp/endpoint.hpp
inc/azure/core/amqp/link.hpp
inc/azure/core/amqp/management.hpp
inc/azure/core/amqp/message_receiver.hpp
inc/azure/core/amqp/message_sender.hpp
inc/azure/core/amqp/rtti.hpp
inc/azure/core/amqp/session.hpp
inc/azure/core/amqp/common/async_operation_queue.hpp
inc/azure/core/amqp/common/completion_operation.hpp
inc/azure/core/amqp/common/global_state.hpp
inc/azure/core/amqp/models/amqp_error.hpp
inc/azure/core/amqp/models/amqp_header.hpp
inc/azure/core/amqp/models/amqp_message.hpp
inc/azure/core/amqp/models/amqp_properties.hpp
inc/azure/core/amqp/models/amqp_value.hpp
inc/azure/core/amqp/models/amqp_protocol.hpp
inc/azure/core/amqp/models/amqp_value.hpp
inc/azure/core/amqp/models/message_source.hpp
inc/azure/core/amqp/models/message_target.hpp
inc/azure/core/amqp/models/messaging_values.hpp
inc/azure/core/amqp/session.hpp
inc/azure/core/amqp/network/amqp_header_detect_transport.hpp
inc/azure/core/amqp/network/sasl_transport.hpp
inc/azure/core/amqp/network/socket_listener.hpp
inc/azure/core/amqp/network/socket_transport.hpp
inc/azure/core/amqp/network/tls_transport.hpp
inc/azure/core/amqp/network/transport.hpp
)

set(AZURE_CORE_AMQP_SOURCE
Expand All @@ -88,6 +99,13 @@ set(AZURE_CORE_AMQP_SOURCE
src/amqp/management.cpp
src/amqp/message_receiver.cpp
src/amqp/message_sender.cpp
src/amqp/private/claims_based_security_impl.hpp
src/amqp/private/connection_impl.hpp
src/amqp/private/link_impl.hpp
src/amqp/private/management_impl.hpp
src/amqp/private/message_receiver_impl.hpp
src/amqp/private/message_sender_impl.hpp
src/amqp/private/session_impl.hpp
src/amqp/session.cpp
src/common/global_state.cpp
src/models/amqp_error.cpp
Expand All @@ -99,11 +117,13 @@ set(AZURE_CORE_AMQP_SOURCE
src/models/message_target.cpp
src/models/messaging_values.cpp
src/network/amqp_header_transport.cpp
src/network/private/transport_impl.hpp
src/network/sasl_transport.cpp
src/network/socket_listener.cpp
src/network/socket_transport.cpp
src/network/tls_transport.cpp
src/network/transport.cpp
src/network/transport.cpp
src/private/package_version.hpp
)

add_library(azure-core-amqp ${AZURE_CORE_AMQP_SOURCE} ${AZURE_CORE_AMQP_HEADER})
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/azure-core-amqp/test/ut/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ add_executable(azure-core-amqp-tests
management_tests.cpp
message_sender_receiver.cpp
message_source_target.cpp
mock_amqp_server.hpp
session_tests.cpp
transport_tests.cpp
transport_tests.cpp
)
add_dependencies(azure-core-amqp-tests Azure::azure-core-amqp)

Expand Down
4 changes: 3 additions & 1 deletion sdk/core/azure-core-amqp/test/ut_uamqp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ find_package(azure_c_shared_utility CONFIG REQUIRED)
# Unit Tests
add_executable(azure-core-amqp-uamqp-tests
amqp_error_tests.cpp
"amqp_insertion_tests.cpp")
amqp_insertion_tests.cpp
)

add_dependencies(azure-core-amqp-uamqp-tests Azure::azure-core-amqp uamqp)

# UAMQP Definitions and headers.
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/azure-core-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ set(
inc/azure/core/test/test_base.hpp
inc/azure/core/test/test_context_manager.hpp
inc/azure/core/test/test_proxy_manager.hpp
inc/azure/core/test/test_proxy_policy.hpp
)

set(
AZURE_CORE_TEST_SOURCE
src/private/package_version.hpp
src/test_proxy_policy.cpp
src/test_base.cpp
src/test_proxy_manager.cpp
src/test_proxy_policy.cpp
)

add_library (
Expand Down
7 changes: 5 additions & 2 deletions sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,17 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)

set(
AZURE_CORE_OPENTELEMETRY_HEADER
inc/azure/core/tracing/opentelemetry/dll_import_export.hpp
inc/azure/core/tracing/opentelemetry/internal/apiview.hpp
inc/azure/core/tracing/opentelemetry/opentelemetry.hpp
src/opentelemetry_private.hpp
inc/azure/core/tracing/opentelemetry/rtti.hpp
)

set(
AZURE_CORE_OPENTELEMETRY_SOURCE
src/opentelemetry.cpp
src/opentelemetry.cpp
src/opentelemetry_private.hpp
src/private/package_version.hpp
)

add_library(azure-core-tracing-opentelemetry ${AZURE_CORE_OPENTELEMETRY_HEADER} ${AZURE_CORE_OPENTELEMETRY_SOURCE})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ include(GoogleTest)
add_executable (
azure-core-tracing-opentelemetry-test
azure_core_otel_test.cpp
azure_core_test.cpp service_support_test.cpp)
azure_core_test.cpp
service_support_test.cpp
test_exporter.hpp
)

if (MSVC)
# Disable warnings:
Expand Down
6 changes: 4 additions & 2 deletions sdk/core/azure-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ set(
AZURE_CORE_HEADER
${CURL_TRANSPORT_ADAPTER_INC}
${WIN_TRANSPORT_ADAPTER_INC}
inc/azure/core.hpp
inc/azure/core.hpp
inc/azure/core/azure_assert.hpp
inc/azure/core/base64.hpp
inc/azure/core/case_insensitive_containers.hpp
Expand All @@ -80,10 +80,11 @@ set(
inc/azure/core/http/policies/policy.hpp
inc/azure/core/http/raw_response.hpp
inc/azure/core/http/transport.hpp
inc/azure/core/internal/credentials/authorization_challenge_parser.hpp
inc/azure/core/internal/client_options.hpp
inc/azure/core/internal/contract.hpp
inc/azure/core/internal/credentials/authorization_challenge_parser.hpp
inc/azure/core/internal/cryptography/sha_hash.hpp
inc/azure/core/internal/diagnostics/global_exception.hpp
inc/azure/core/internal/diagnostics/log.hpp
inc/azure/core/internal/environment.hpp
inc/azure/core/internal/extendable_enumeration.hpp
Expand All @@ -97,6 +98,7 @@ set(
inc/azure/core/internal/strings.hpp
inc/azure/core/internal/tracing/service_tracing.hpp
inc/azure/core/internal/tracing/tracing_impl.hpp
inc/azure/core/internal/unique_handle.hpp
inc/azure/core/io/body_stream.hpp
inc/azure/core/match_conditions.hpp
inc/azure/core/modified_conditions.hpp
Expand Down
1 change: 1 addition & 0 deletions sdk/core/azure-core/test/perf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
set(
AZURE_CORE_PERF_TEST_HEADER
inc/azure/core/test/nullable_test.hpp
inc/azure/core/test/uuid_test.hpp
)

set(
Expand Down
13 changes: 7 additions & 6 deletions sdk/core/azure-core/test/ut/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ endif()

add_executable (
azure-core-test
${CURL_CONNECTION_POOL_TESTS}
${CURL_OPTIONS_TESTS}
${CURL_SESSION_TESTS}
assert_test.cpp
authorization_challenge_parser_test.cpp
azure_core_test.cpp
Expand All @@ -55,17 +58,15 @@ add_executable (
case_insensitive_containers_test.cpp
client_options_test.cpp
context_test.cpp
${CURL_CONNECTION_POOL_TESTS}
${CURL_OPTIONS_TESTS}
${CURL_SESSION_TESTS}
datetime_test.cpp
environment_log_level_listener_test.cpp
extendable_enumeration_test.cpp
etag_test.cpp
exception_test.cpp
extendable_enumeration_test.cpp
global_context_test.cpp
http_method_test.cpp
http_test.cpp
http_test.hpp
http_method_test.cpp
json_test.cpp
log_policy_test.cpp
logging_test.cpp
Expand All @@ -74,9 +75,9 @@ add_executable (
md5_test.cpp
modified_conditions_test.cpp
nullable_test.cpp
operation_status_test.cpp
operation_test.cpp
operation_test.hpp
operation_status_test.cpp
pipeline_test.cpp
policy_test.cpp
request_activity_policy_test.cpp
Expand Down
3 changes: 2 additions & 1 deletion sdk/core/perf/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ include(AzureTransportAdapters)

set(
AZURE_PERFORMANCE_HEADER
inc/azure/perf.hpp
inc/azure/perf/argagg.hpp
inc/azure/perf/base_test.hpp
inc/azure/perf/dynamic_test_options.hpp
inc/azure/perf/options.hpp
inc/azure/perf/program.hpp
inc/azure/perf/random_stream.hpp
inc/azure/perf/test_metadata.hpp
inc/azure/perf/test.hpp
inc/azure/perf/test_metadata.hpp
inc/azure/perf/test_options.hpp
)

Expand Down
1 change: 1 addition & 0 deletions sdk/core/perf/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ set(
inc/azure/perf/test/exception_test.hpp
inc/azure/perf/test/extended_options_test.hpp
inc/azure/perf/test/http_client_get_test.hpp
inc/azure/perf/test/http_pipeline_get_test.hpp
inc/azure/perf/test/no_op_test.hpp
inc/azure/perf/test/win_http_client_get_test.hpp
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,14 @@ endif()
set(
AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_HEADER
inc/azure/messaging/eventhubs/checkpointstore_blob/blob_checkpoint_store.hpp
inc/azure/messaging/eventhubs/checkpointstore_blob/dll_import_export.hpp
inc/azure/messaging/eventhubs/checkpointstore_blob/rtti.hpp
)

set(
AZURE_MESSAGING_EVENTHUBS_BLOB_CHECKPOINT_SOURCE
src/blob_checkpoint_store.cpp
src/private/package_version.hpp
)

add_library(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ SetUpTestProxy("sdk/eventhubs")
add_executable (
azure-messaging-eventhubs-blobstore-test
blob_checkpoint_store_test.cpp
eventhubs_test_base.hpp
)

create_per_service_target_build(eventhubs azure-messaging-eventhubs-blobstore-test)
Expand Down
Loading

0 comments on commit 50c1851

Please sign in to comment.