From 3ec224eaf69fdf640dc58e072c18d3b5e2747958 Mon Sep 17 00:00:00 2001
From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com>
Date: Tue, 17 May 2022 12:22:55 -0700
Subject: [PATCH] Clean up target_include_directories() (#3641)

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
---
 sdk/identity/azure-identity/CMakeLists.txt                   | 1 -
 .../azure-security-keyvault-certificates/CMakeLists.txt      | 4 +---
 sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt     | 2 --
 sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt  | 2 --
 sdk/template/azure-template/CMakeLists.txt                   | 5 +----
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
index f4760cfb01..75594bdfbb 100644
--- a/sdk/identity/azure-identity/CMakeLists.txt
+++ b/sdk/identity/azure-identity/CMakeLists.txt
@@ -82,7 +82,6 @@ target_include_directories(
     PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
       $<INSTALL_INTERFACE:include>
-      ${azure-core-cpp_INCLUDE_DIRS}
 )
 
 target_link_libraries(azure-identity PUBLIC Azure::azure-core)
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
index 4c999dedd9..27cd1c1943 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
@@ -73,11 +73,9 @@ target_include_directories(
   azure-security-keyvault-certificates
     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>
 )
-message($<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc)
+
 # Include shared source code
 # NOTE: Use shared-code only within .cpp files. DO NEVER consume the shared-code from header files.
 target_include_directories(
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index 684ab3c60a..5fb37a7add 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -112,8 +112,6 @@ 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>
 )
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
index a5f0dc3365..67f343263b 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
@@ -83,8 +83,6 @@ target_include_directories(
   azure-security-keyvault-secrets
     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>
 )
 
diff --git a/sdk/template/azure-template/CMakeLists.txt b/sdk/template/azure-template/CMakeLists.txt
index c78558f5e9..7d4d3126a4 100644
--- a/sdk/template/azure-template/CMakeLists.txt
+++ b/sdk/template/azure-template/CMakeLists.txt
@@ -60,12 +60,9 @@ target_include_directories(
     PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
       $<INSTALL_INTERFACE:include>
-      # Disable dependency on azure-core until azure-core has released to vcpkg
-      # ${azure-core-cpp_INCLUDE_DIRS}
 )
 
-# Disable dependency on azure-core until azure-core has released to vcpkg
-# target_link_libraries(azure-template PUBLIC Azure::azure-core)
+target_link_libraries(azure-template PUBLIC Azure::azure-core)
 
 # make sure that users can consume the project as a library.
 add_library(Azure::azure-template ALIAS azure-template)