From 355c4fb6a313a402ec108a0742073abb7e8f00ac Mon Sep 17 00:00:00 2001
From: Helena Kotas <hekotas@microsoft.com>
Date: Fri, 5 Jun 2020 20:35:33 -0700
Subject: [PATCH] Move Dxc runtime tracing one level up so other project can
 use it without referencing dxilconv (#2948)

---
 projects/CMakeLists.txt                                | 4 ++++
 projects/dxilconv/CMakeLists.txt                       | 3 ++-
 projects/{dxilconv => }/include/Tracing/CMakeLists.txt | 0
 projects/{dxilconv => }/include/Tracing/DxcRuntime.man | 0
 4 files changed, 6 insertions(+), 1 deletion(-)
 rename projects/{dxilconv => }/include/Tracing/CMakeLists.txt (100%)
 rename projects/{dxilconv => }/include/Tracing/DxcRuntime.man (100%)

diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 13e4e7339..d3093985a 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -1,3 +1,7 @@
+set(DXC_PROJECTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(DXC_PROJECTS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
 if(WIN32 AND HLSL_BUILD_DXILCONV)
+  add_subdirectory(include/Tracing)
   add_subdirectory(dxilconv)
 endif (WIN32 AND HLSL_BUILD_DXILCONV)
diff --git a/projects/dxilconv/CMakeLists.txt b/projects/dxilconv/CMakeLists.txt
index fbbeb5294..0d56576e9 100644
--- a/projects/dxilconv/CMakeLists.txt
+++ b/projects/dxilconv/CMakeLists.txt
@@ -3,6 +3,8 @@ set(DXILCONV_PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(
   ${LLVM_MAIN_INCLUDE_DIR}
+  ${DXC_PROJECTS_SOURCE_DIR}/include
+  ${DXC_PROJECTS_BINARY_DIR}/include
   ${DXILCONV_PROJECT_SOURCE_DIR}/include
   ${DXILCONV_PROJECT_BINARY_DIR}/include
 )
@@ -29,5 +31,4 @@ if(WIN32)
  add_subdirectory(lib)
  add_subdirectory(tools)
  add_subdirectory(unittests)
- add_subdirectory(include/Tracing)
 endif()
\ No newline at end of file
diff --git a/projects/dxilconv/include/Tracing/CMakeLists.txt b/projects/include/Tracing/CMakeLists.txt
similarity index 100%
rename from projects/dxilconv/include/Tracing/CMakeLists.txt
rename to projects/include/Tracing/CMakeLists.txt
diff --git a/projects/dxilconv/include/Tracing/DxcRuntime.man b/projects/include/Tracing/DxcRuntime.man
similarity index 100%
rename from projects/dxilconv/include/Tracing/DxcRuntime.man
rename to projects/include/Tracing/DxcRuntime.man