Read the surface data from json.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d919e8bcd5009de261d67c59ce988e9bbde9f0e..506325e0a8956ffb5d1388252f3ae0b6986ab900 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,17 +186,15 @@ else ()
     )
 
     add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
-    set_target_properties (glxtrace PROPERTIES 
-        COMPILER_DEFINITIONS "-DRETRACE"
-        PREFIX ""
-    )
     target_link_libraries (glxtrace dl)
 endif ()
 
 if (WIN32)
     set (os os_win32.cpp)
+    set (glws glws_wgl.cpp)
 else (WIN32)
     set (os os_posix.cpp)
+    set (glws glws_glx.cpp)
 endif (WIN32)
 
 add_library (trace trace_model.cpp trace_parser.cpp ${os})
@@ -223,12 +221,18 @@ include_directories (
 
 add_executable (glretrace
     glretrace.cpp
-    glretrace_xlib.cpp
     glstate.cpp
+    ${glws}
     image.cpp 
     ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
 )
 
+set_property (
+    TARGET glretrace
+    APPEND
+    PROPERTY COMPILE_DEFINITIONS "RETRACE"
+)
+
 target_link_libraries (glretrace
     trace
     ${OPENGL_gl_LIBRARY}
@@ -236,7 +240,5 @@ target_link_libraries (glretrace
 )
 
 if (QT4_FOUND AND QJSON_FOUND)
-    # Include the cmake file needed to use qt4
-    include( ${QT_USE_FILE} )
     add_subdirectory(gui)
 endif (QT4_FOUND AND QJSON_FOUND)