Add a state tab that list uniforms.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d6687132de50f10294b712213e838ac987ed2d4..fbea05b96a929018c62e6c012da0033d4e0baaf9 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,17 @@ cmake_minimum_required (VERSION 2.8)
 project (apitrace)
 
 
+##############################################################################
+# Options
+#
+# We use a cached string variable instead of the standard (boolean) OPTION
+# command so that we can default to auto-detecting optional depencies, while
+# still providing a mechanism to force/disable these optional dependencies, as
+# prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml
+
+set (ENABLE_GUI "AUTO" CACHE STRING "Enable QT GUI.")
+
+
 ##############################################################################
 # Find dependencies
 
@@ -12,8 +23,14 @@ set (CMAKE_USE_PYTHON_VERSION 2.7 2.6)
 
 find_package (PythonInterp REQUIRED)
 find_package (OpenGL REQUIRED)
-find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit)
-find_package (QJSON)
+
+if (ENABLE_GUI)
+    if (NOT (ENABLE_GUI STREQUAL "AUTO"))
+        set (REQUIRE_GUI REQUIRED)
+    endif ()
+    find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit ${REQUIRE_GUI})
+    find_package (QJSON ${REQUIRE_GUI})
+endif ()
 
 if (NOT WIN32)
     find_package (X11 REQUIRED)
@@ -155,10 +172,20 @@ else (WIN32)
     set (glws glws_glx.cpp)
 endif (WIN32)
 
-add_library (trace trace_model.cpp trace_parser.cpp trace_writer.cpp trace_model_writer.cpp ${os})
+add_library (common
+    trace_model.cpp
+    trace_parser.cpp
+    trace_writer.cpp
+    trace_model_writer.cpp
+    image.cpp
+    image_bmp.cpp
+    image_pnm.cpp
+    image_png.cpp
+    ${os}
+)
 
 add_executable (tracedump tracedump.cpp)
-target_link_libraries (tracedump trace)
+target_link_libraries (tracedump common)
 install (TARGETS tracedump RUNTIME DESTINATION bin) 
 
 
@@ -236,7 +263,13 @@ if (WIN32)
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp
         DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glparams.py gltypes.py winapi.py stdapi.py
     )
-    add_library (wgltrace MODULE opengl32.def wgltrace.cpp trace_writer.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+    add_library (wgltrace MODULE opengl32.def
+        wgltrace.cpp
+        glcaps.cpp
+        trace_writer.cpp
+        os_win32.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+    )
     set_target_properties (wgltrace PROPERTIES
         PREFIX ""
         OUTPUT_NAME opengl32
@@ -256,7 +289,13 @@ elseif (APPLE)
         DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py
     )
 
-    add_library (cgltrace SHARED cgltrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+    add_library (cgltrace SHARED
+        cgltrace.cpp
+        glcaps.cpp
+        trace_writer.cpp
+        os_posix.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+    )
 
     set_target_properties (cgltrace PROPERTIES
         # OpenGL framework name
@@ -281,9 +320,11 @@ else ()
     add_library (glxtrace SHARED
         ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
         glxtrace.cpp
+        glcaps.cpp
         glsnapshot.cpp
         trace_writer.cpp
         image.cpp
+        image_png.cpp
         os_posix.cpp
     )
 
@@ -345,7 +386,7 @@ set_property (
 )
 
 target_link_libraries (glretrace
-    trace
+    common
 )
 
 if (WIN32)
@@ -368,9 +409,9 @@ install (TARGETS glretrace RUNTIME DESTINATION bin)
 ##############################################################################
 # GUI
 
-if (QT4_FOUND AND QJSON_FOUND)
+if (ENABLE_GUI AND QT4_FOUND AND QJSON_FOUND)
     add_subdirectory(gui)
-endif (QT4_FOUND AND QJSON_FOUND)
+endif ()
 
 
 ##############################################################################