dxgitrace: Merge tracing of all DXGI related APIs.

[apitrace] / retrace / CMakeLists.txt

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index c582338c00cd9534365879e44cb3bf7dd5248f06..fd51c2dd9ede6f39416a65d727e7f061b1b880a5 100644 (file)
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -148,21 +148,25 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
 
     if (DirectX_D3D10_INCLUDE_DIR)
         include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
-        set (D3D10_MODULES d3d10)
+        set (DXGI_MODULES d3d10)
         if (DirectX_D3D10_1_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
-            set (D3D10_MODULES ${D3D10_MODULES} d3d10_1)
+            set (DXGI_MODULES ${DXGI_MODULES} d3d10_1)
         endif ()
+        set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
+            d3d10state.cpp
+            d3d10state_images.cpp
+        )
     endif ()
 
     if (DirectX_D3D11_INCLUDE_DIR)
         include_directories (SYSTEM ${DirectX_D3D11_INCLUDE_DIR})
-        set (D3D10_MODULES ${D3D10_MODULES} d3d11)
+        set (DXGI_MODULES ${DXGI_MODULES} d3d11)
         if (DirectX_D3D11_1_INCLUDE_DIR)
             include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
-            set (D3D10_MODULES ${D3D10_MODULES} d3d11_1)
+            set (DXGI_MODULES ${DXGI_MODULES} d3d11_1)
         endif ()
-        set (D3D11STATE_SOURCES
+        set (D3DSTATE_SOURCES ${D3DSTATE_SOURCES}
             d3d11state.cpp
             d3d11state_images.cpp
         )
@@ -170,7 +174,7 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
 
     add_custom_command (
         OUTPUT d3dretrace_d3d10.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3dcommonretrace.py ${D3D10_MODULES} > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d10.cpp
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3dcommonretrace.py ${DXGI_MODULES} > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d10.cpp
         DEPENDS
                 d3dcommonretrace.py
                 dllretrace.py
@@ -200,7 +204,7 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
         d3dretrace_ws.cpp
         d3d9state.cpp
         d3d9state_images.cpp
-        ${D3D11STATE_SOURCES}
+        ${D3DSTATE_SOURCES}
     )
     target_link_libraries (d3dretrace
         retrace_common