From 60a4792a0f6474eae3289f6247819f45c0d2430d Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Wed, 27 Jan 2021 18:55:46 -0800 Subject: [PATCH] Make cmake modules consistent names (#1498) * AzureVersion * Vcpkg * coverage * missing renames * missing renames --- CMakeLists.txt | 8 ++++---- .../{CodeCoverage.cmake => AzureCodeCoverage.cmake} | 0 .../{doxygen_common.cmake => AzureDoxygen.cmake} | 0 ...options.cmake => AzureGlobalCompileOptions.cmake} | 0 ...ortAdapter.cmake => AzureTransportAdapters.cmake} | 0 cmake-modules/{az_vcpkg.cmake => AzureVcpkg.cmake} | 0 .../{az_version.cmake => AzureVersion.cmake} | 0 ...ad_test_data.cmake => DownloadJsonTestData.cmake} | 0 sdk/core/azure-core/CMakeLists.txt | 12 ++++++------ .../test/nlohmann-json-test/CMakeLists.txt | 2 +- sdk/identity/azure-identity/CMakeLists.txt | 12 ++++++------ .../azure-security-keyvault-common/CMakeLists.txt | 12 ++++++------ .../azure-security-keyvault-keys/CMakeLists.txt | 12 ++++++------ sdk/storage/azure-storage-blobs/CMakeLists.txt | 12 ++++++------ sdk/storage/azure-storage-common/CMakeLists.txt | 12 ++++++------ .../azure-storage-files-datalake/CMakeLists.txt | 12 ++++++------ .../azure-storage-files-shares/CMakeLists.txt | 12 ++++++------ sdk/template/azure-template/CMakeLists.txt | 12 ++++++------ 18 files changed, 59 insertions(+), 59 deletions(-) rename cmake-modules/{CodeCoverage.cmake => AzureCodeCoverage.cmake} (100%) rename cmake-modules/{doxygen_common.cmake => AzureDoxygen.cmake} (100%) rename cmake-modules/{global_compile_options.cmake => AzureGlobalCompileOptions.cmake} (100%) rename cmake-modules/{DefineTransportAdapter.cmake => AzureTransportAdapters.cmake} (100%) rename cmake-modules/{az_vcpkg.cmake => AzureVcpkg.cmake} (100%) rename cmake-modules/{az_version.cmake => AzureVersion.cmake} (100%) rename cmake-modules/{download_test_data.cmake => DownloadJsonTestData.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e42c577d7..6d56bbc62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ option(BUILD_DOCUMENTATION "Create HTML based API documentation (requires Doxyge option(RUN_LONG_UNIT_TESTS "Tests that takes more than 5 minutes to complete. No effect if BUILD_TESTING is OFF" OFF) option(BUILD_STORAGE_SAMPLES "Build sample application for Azure Storage clients" OFF) -include(DefineTransportAdapter) +include(AzureTransportAdapters) # VCPKG Integration if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) @@ -55,13 +55,13 @@ if(BUILD_TESTING) endif() # compiler warning flags globally -include(global_compile_options) +include(AzureGlobalCompileOptions) # Documentation automation function -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/doxygen_common.cmake) +include(AzureDoxygen) # Functions for library versions -include(${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules/az_version.cmake) +include(AzureVersion) # sub-projects # add_subdirectory(sdk/core/performance-stress) diff --git a/cmake-modules/CodeCoverage.cmake b/cmake-modules/AzureCodeCoverage.cmake similarity index 100% rename from cmake-modules/CodeCoverage.cmake rename to cmake-modules/AzureCodeCoverage.cmake diff --git a/cmake-modules/doxygen_common.cmake b/cmake-modules/AzureDoxygen.cmake similarity index 100% rename from cmake-modules/doxygen_common.cmake rename to cmake-modules/AzureDoxygen.cmake diff --git a/cmake-modules/global_compile_options.cmake b/cmake-modules/AzureGlobalCompileOptions.cmake similarity index 100% rename from cmake-modules/global_compile_options.cmake rename to cmake-modules/AzureGlobalCompileOptions.cmake diff --git a/cmake-modules/DefineTransportAdapter.cmake b/cmake-modules/AzureTransportAdapters.cmake similarity index 100% rename from cmake-modules/DefineTransportAdapter.cmake rename to cmake-modules/AzureTransportAdapters.cmake diff --git a/cmake-modules/az_vcpkg.cmake b/cmake-modules/AzureVcpkg.cmake similarity index 100% rename from cmake-modules/az_vcpkg.cmake rename to cmake-modules/AzureVcpkg.cmake diff --git a/cmake-modules/az_version.cmake b/cmake-modules/AzureVersion.cmake similarity index 100% rename from cmake-modules/az_version.cmake rename to cmake-modules/AzureVersion.cmake diff --git a/cmake-modules/download_test_data.cmake b/cmake-modules/DownloadJsonTestData.cmake similarity index 100% rename from cmake-modules/download_test_data.cmake rename to cmake-modules/DownloadJsonTestData.cmake diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt index 998977633..f23c34e67 100644 --- a/sdk/core/azure-core/CMakeLists.txt +++ b/sdk/core/azure-core/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/core/azure-core/test/nlohmann-json-test/CMakeLists.txt b/sdk/core/azure-core/test/nlohmann-json-test/CMakeLists.txt index bedcb7727..88f4c85f0 100644 --- a/sdk/core/azure-core/test/nlohmann-json-test/CMakeLists.txt +++ b/sdk/core/azure-core/test/nlohmann-json-test/CMakeLists.txt @@ -1,5 +1,5 @@ # download test data -include(download_test_data) +include(DownloadJsonTestData) # test fixture to download test data add_test(NAME "download_test_data" COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target download_test_data) diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt index 78fb01bcf..ac2331bae 100644 --- a/sdk/identity/azure-identity/CMakeLists.txt +++ b/sdk/identity/azure-identity/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt index 04da8cc75..1d88baf2f 100644 --- a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt index 3ee86e86f..5fe7632b4 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt +++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index fd0d009dc..30bc33eca 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index 9b366b11c..8e1fba9c4 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index c7d51f725..ab2b650d0 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index de2e5add7..62e60ee3c 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate() diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt index 3c13e7b9f..46d65982b 100644 --- a/sdk/template/azure-template/CMakeLists.txt +++ b/sdk/template/azure-template/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake-modules") -include(az_vcpkg) -include(az_version) -include(CodeCoverage) -include(DefineTransportAdapter) -include(doxygen_common) -include(global_compile_options) +include(AzureVcpkg) +include(AzureVersion) +include(AzureCodeCoverage) +include(AzureTransportAdapters) +include(AzureDoxygen) +include(AzureGlobalCompileOptions) az_vcpkg_integrate()