X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=e840f21d193608b386d33edf84f72ea3511e1ea9;hb=75e8c9b7c7f2f10d9b7f479d45f58d81ea729d30;hp=f388991973368cc101f53fafb78da64bbecd333a;hpb=935cd91ab9deb98b72757b562803074ebfd58b6d;p=apitrace

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f388991..e840f21 100755
--- 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)
@@ -65,7 +82,7 @@ endif (WIN32)
 
 if (MSVC)
     # C99 includes for msvc
-    include_directories (msvc)
+    include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msvc)
 
     # Enable math constants defines
     add_definitions (-D_USE_MATH_DEFINES)
@@ -105,9 +122,7 @@ endif ()
 
 # Put all executables into the same top level build directory, regardless of
 # which subdirectory they are declared
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 
 ##############################################################################
@@ -118,26 +133,38 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 # - on unices to prevent symbol collisions when tracing applications that link
 # against other versions of these libraries
 
-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
+set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
 set (ZLIB_LIBRARIES z_bundled)
-add_subdirectory (zlib EXCLUDE_FROM_ALL)
+add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
 
 include_directories (${ZLIB_INCLUDE_DIRS})
 link_libraries (${ZLIB_LIBRARIES})
 
-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libpng)
+set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+set (SNAPPY_LIBRARIES snappy_bundled)
+add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
+
+include_directories (${SNAPPY_INCLUDE_DIRS})
+link_libraries (${SNAPPY_LIBRARIES})
+
+set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
 set (PNG_DEFINITIONS "")
 set (PNG_LIBRARIES png_bundled)
 
-add_subdirectory (libpng EXCLUDE_FROM_ALL)
+add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL)
 include_directories (${PNG_INCLUDE_DIR})
 add_definitions (${PNG_DEFINITIONS})
 link_libraries (${PNG_LIBRARIES})
 
+# For glext headers
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+
 
 ##############################################################################
 # Common libraries / utilities
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
 add_custom_command (
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@ -152,10 +179,29 @@ 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_file.cpp
+    trace_snappyfile.cpp
+    trace_model.cpp
+    trace_parser.cpp
+    trace_writer.cpp
+    trace_local_writer.cpp
+    trace_model_writer.cpp
+    image.cpp
+    image_bmp.cpp
+    image_pnm.cpp
+    image_png.cpp
+    ${os}
+)
+
+set_target_properties (common PROPERTIES
+    # Ensure it can be statically linked in shared libraries
+    COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}"
+)
+
+link_libraries (common)
 
 add_executable (tracedump tracedump.cpp)
-target_link_libraries (tracedump trace)
 install (TARGETS tracedump RUNTIME DESTINATION bin) 
 
 
@@ -171,7 +217,7 @@ if (WIN32)
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d.py > ${CMAKE_CURRENT_BINARY_DIR}/ddraw.cpp
             DEPENDS d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
         )
-        add_library (ddraw MODULE ddraw.def ddraw.cpp trace_writer.cpp os_win32.cpp)
+        add_library (ddraw MODULE ddraw.def ddraw.cpp)
         set_target_properties (ddraw
             PROPERTIES PREFIX ""
             RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@ -188,7 +234,7 @@ if (WIN32)
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
             DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
         )
-        add_library (d3d8 MODULE d3d8.def d3d8.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
+        add_library (d3d8 MODULE d3d8.def d3d8.cpp d3dshader.cpp)
         set_target_properties (d3d8
             PROPERTIES PREFIX ""
             RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@ -205,7 +251,7 @@ if (WIN32)
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
             DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
         )
-        add_library (d3d9 MODULE d3d9.def d3d9.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
+        add_library (d3d9 MODULE d3d9.def d3d9.cpp d3dshader.cpp)
         set_target_properties (d3d9
             PROPERTIES PREFIX ""
             RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@ -222,7 +268,7 @@ if (WIN32)
     #        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp
     #        DEPENDS d3d10misc.py winapi.py stdapi.py
     #    )
-    #    add_library (d3d10 MODULE d3d10.def d3d10.cpp trace_writer.cpp os_win32.cpp)
+    #    add_library (d3d10 MODULE d3d10.def d3d10.cpp)
     #    set_target_properties (d3d10 PROPERTIES PREFIX "")
     #    install (TARGETS d3d10 LIBRARY DESTINATION wrappers)
     #endif (DirectX_D3D10_INCLUDE_DIR)
@@ -233,7 +279,11 @@ 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
+        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+    )
     set_target_properties (wgltrace PROPERTIES
         PREFIX ""
         OUTPUT_NAME opengl32
@@ -253,7 +303,11 @@ 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
+        ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+    )
 
     set_target_properties (cgltrace PROPERTIES
         # OpenGL framework name
@@ -278,10 +332,8 @@ else ()
     add_library (glxtrace SHARED
         ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
         glxtrace.cpp
+        glcaps.cpp
         glsnapshot.cpp
-        trace_writer.cpp
-        image.cpp
-        os_posix.cpp
     )
 
     set_target_properties (glxtrace PROPERTIES
@@ -296,7 +348,7 @@ else ()
     )
 
     target_link_libraries (glxtrace dl ${X11_X11_LIB})
-    
+
     install (TARGETS glxtrace LIBRARY DESTINATION lib)
 endif ()
 
@@ -342,7 +394,7 @@ set_property (
 )
 
 target_link_libraries (glretrace
-    trace
+    common
 )
 
 if (WIN32)
@@ -365,15 +417,15 @@ 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 ()
 
 
 ##############################################################################
 # Packaging
 
-install (FILES LICENSE README TODO DESTINATION doc)
+install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
 
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "0")