From b4c190b285b4b492936cfe193675477377466d5b Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Fri, 5 Feb 2021 21:19:28 -0800 Subject: [PATCH] Remove vcpkg integration snippet duplication for the root cmakefile (#1612) * Remove vcpkg integration for the root cmakefile * az_vcpkg_integrate() Co-authored-by: Anton Kolesnyk --- CMakeLists.txt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cd828444..d126b1984 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,18 +20,9 @@ option(BUILD_STORAGE_SAMPLES "Build sample application for Azure Storage clients option(BUILD_PERFORMANCE_TESTS "Build the performance test library" OFF) include(AzureTransportAdapters) +include(AzureVcpkg) -# VCPKG Integration -if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") -elseif(DEFINED ENV{VCPKG_INSTALLATION_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) - set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" - CACHE STRING "") -endif() -if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") -endif() +az_vcpkg_integrate() # Project definition project(azure-sdk LANGUAGES CXX)