Clear the surfaces tree when changing calls.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd108fd9d8eae21a1dbb9725feb7ca533078ddaf..506325e0a8956ffb5d1388252f3ae0b6986ab900 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,8 @@ set (CMAKE_USE_PYTHON_VERSION 2.6)
 
 find_package (PythonInterp REQUIRED)
 find_package (OpenGL REQUIRED)
-find_package (Qt4)
+find_package (Qt4 COMPONENTS QtCore QtGui QtWebKit)
+find_package (QJSON)
 
 if (NOT WIN32)
     # Always use the bundled zlib and libpng sources on Windows to make it easy
@@ -27,8 +28,6 @@ else (NOT WIN32)
     find_package (DirectX)
 endif (NOT WIN32)
 
-find_package (GLUT)
-
 if (WIN32)
     # MSVC & MinGW only define & use APIENTRY
     add_definitions (-DGLAPIENTRY=__stdcall)
@@ -187,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})
@@ -205,40 +202,43 @@ add_library (trace trace_model.cpp trace_parser.cpp ${os})
 add_executable (dump dump.cpp)
 target_link_libraries (dump trace)
 
-if (GLUT_INCLUDE_DIR)
-    add_custom_command (
-        OUTPUT glretrace.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
-        DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
-    )
+add_custom_command (
+    OUTPUT glretrace.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
+    DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
+)
 
-    add_custom_command (
-        OUTPUT glstate.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate.cpp
-        DEPENDS glstate.py glenum.py stdapi.py
-    )
+add_custom_command (
+    OUTPUT glstate.cpp
+    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate.cpp
+    DEPENDS glstate.py glenum.py stdapi.py
+)
 
-    include_directories (
-        ${CMAKE_CURRENT_BINARY_DIR}
-        ${OPENGL_INCLUDE_PATH}
-        ${GLUT_INCLUDE_DIR}
-    )
+include_directories (
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OPENGL_INCLUDE_PATH}
+)
 
-    add_executable (glretrace
-        glretrace.cpp
-        glstate.cpp
-        image.cpp 
-        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
-    )
+add_executable (glretrace
+    glretrace.cpp
+    glstate.cpp
+    ${glws}
+    image.cpp 
+    ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+)
 
-    target_link_libraries (glretrace
-        trace
-        ${OPENGL_gl_LIBRARY}
-        ${OPENGL_glu_LIBRARY}
-        ${GLUT_glut_LIBRARY}
-    )
-endif (GLUT_INCLUDE_DIR)
+set_property (
+    TARGET glretrace
+    APPEND
+    PROPERTY COMPILE_DEFINITIONS "RETRACE"
+)
+
+target_link_libraries (glretrace
+    trace
+    ${OPENGL_gl_LIBRARY}
+    ${OPENGL_glu_LIBRARY}
+)
 
-if (QT4_FOUND)
+if (QT4_FOUND AND QJSON_FOUND)
     add_subdirectory(gui)
-endif (QT4_FOUND)
+endif (QT4_FOUND AND QJSON_FOUND)