From e18c6ce6fc0a64bab9deccf5476bf62ef7a0c200 Mon Sep 17 00:00:00 2001
From: George Arama <50641385+gearama@users.noreply.github.com>
Date: Tue, 25 Jan 2022 15:38:55 -0800
Subject: [PATCH] keys source build (#3251)

* keys source build

* merge from main, apply changes
---
 cmake-modules/FolderList.cmake                |  7 +++++-
 .../CMakeLists.txt                            |  1 -
 .../CMakeLists.txt                            | 23 +++++++++++++++++--
 sdk/keyvault/ci.yml                           |  3 +++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/cmake-modules/FolderList.cmake b/cmake-modules/FolderList.cmake
index 480abfa47..fd5baa32e 100644
--- a/cmake-modules/FolderList.cmake
+++ b/cmake-modules/FolderList.cmake
@@ -9,7 +9,12 @@ macro(GetFolderList project)
     endif()
 
     if(${project} STREQUAL SECRETS)
-        DownloadDepVersion(sdk/core azure-core 1.3.1)
+        DownloadDepVersion(sdk/core azure-core 1.2.0)
+        DownloadDepVersion(sdk/identity azure-identity 1.1.0)
+    endif()
+
+    if(${project} STREQUAL KEYS)
+        DownloadDepVersion(sdk/core azure-core 1.2.0)
         DownloadDepVersion(sdk/identity azure-identity 1.1.0)
     endif()
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
index 4e0b5ed9c..2ac56d4ce 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
@@ -128,5 +128,4 @@ az_rtti_setup(
 )
 
 unset(FETCH_SOURCE_DEPS CACHE)
-unset(FETCH_SOURCE_DEPS PARENT_SCOPE)
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index 7e1d6154b..27f7dd7b0 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -9,10 +9,19 @@ az_vcpkg_integrate()
 cmake_minimum_required (VERSION 3.13)
 project(azure-security-keyvault-keys LANGUAGES CXX)
 
+# Compile Options
+option(FETCH_SOURCE_DEPS "build source dependencies" OFF)
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
+if(FETCH_SOURCE_DEPS)
+    set(AZ_ALL_LIBRARIES ON)
+    include(FolderList)
+    SetCompileOptions(KEYS)
+endif()
+
 include(AzureVersion)
 include(AzureCodeCoverage)
 include(AzureTransportAdapters)
@@ -23,7 +32,13 @@ include(AzureBuildTargetForCI)
 # Add create_map_file function
 include(CreateMapFile)
 
-if(NOT AZ_ALL_LIBRARIES)
+if(FETCH_SOURCE_DEPS)
+    GetFolderList(KEYS)
+    foreach(oneFolder IN LISTS BUILD_FOLDERS)
+        message("add folder ${oneFolder}")
+        add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
+    endforeach()
+elseif(NOT AZ_ALL_LIBRARIES)
   find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
   if(NOT azure-core-cpp_FOUND)
     find_package(azure-core-cpp "1.2.0" REQUIRED)
@@ -97,6 +112,8 @@ target_include_directories(
   azure-security-keyvault-keys
     PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+      $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/../../../sdk/core/inc>
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/build/sdk/core/azure-core/inc>
       $<INSTALL_INTERFACE:include>
 )
 
@@ -118,7 +135,7 @@ generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION})
 
 if(BUILD_TESTING)
 
-  if (NOT AZ_ALL_LIBRARIES)
+  if (NOT AZ_ALL_LIBRARIES OR FETCH_SOURCE_DEPS)
     include(AddGoogleTest)
     enable_testing ()
   endif()
@@ -145,3 +162,5 @@ az_rtti_setup(
   SECURITY_KEYVAULT_KEYS
   "azure/keyvault/keys/rtti.hpp"
 )
+
+unset(FETCH_SOURCE_DEPS CACHE)
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 5adba2e41..82c9f8e6d 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -45,6 +45,9 @@ stages:
           Path: azure-security-keyvault-certificates
           VcpkgPortName: azure-security-keyvault-certificates-cpp
       ArtifactsSource:
+        - Name: azure-security-keyvault-keys
+          Path: azure-security-keyvault-keys
+          VcpkgPortName: azure-security-keyvault-keys-cpp
         - Name: azure-security-keyvault-certificates
           Path: azure-security-keyvault-certificates
           VcpkgPortName: azure-security-keyvault-keys-cpp