Browse Source

Move Dxc runtime tracing one level up so other project can use it without referencing dxilconv (#2948)

Helena Kotas 5 years ago
parent
commit
355c4fb6a3

+ 4 - 0
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)

+ 2 - 1
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()

+ 0 - 0
projects/dxilconv/include/Tracing/CMakeLists.txt → projects/include/Tracing/CMakeLists.txt


+ 0 - 0
projects/dxilconv/include/Tracing/DxcRuntime.man → projects/include/Tracing/DxcRuntime.man