##############################################################################
# Options
-#
+
+# On Mac OS X build fat binaries with i386 and x86_64 architectures by default.
+if (APPLE AND NOT CMAKE_OSX_ARCHITECTURES)
+ set (CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+endif ()
+
# 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_package (QJSON ${REQUIRE_GUI})
endif ()
-if (NOT WIN32)
+if (WIN32)
+ find_package (DirectX)
+elseif (APPLE)
+else ()
find_package (X11 REQUIRED)
- # On Mac OS X, GLX is provided as a separate OpenGL implementation, different
- # from the standard OpenGL framework which provides support for native Mac OS X
- # applications.
- if (APPLE)
- find_path (X11_GL_INCLUDE_PATH GL/glx.h ${X11_INC_SEARCH_PATH})
- if (NOT X11_GL_INCLUDE_PATH)
- message (SEND_ERROR "Could not find GL/glx.h")
- endif (NOT X11_GL_INCLUDE_PATH)
- set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_GL_INCLUDE_PATH})
-
- find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH})
- if (NOT X11_GL_LIB)
- message (SEND_ERROR "Could not find libGL.dylib")
- endif (NOT X11_GL_LIB)
- else ()
- set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
- set (X11_GL_LIB ${OPENGL_gl_LIBRARY})
- endif ()
+ set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ set (X11_GL_LIB ${OPENGL_gl_LIBRARY})
include_directories (${X11_INCLUDE_DIR})
-endif (NOT WIN32)
-
-if (WIN32)
- find_package (DirectX)
-endif (WIN32)
+endif ()
##############################################################################
add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions
endif ()
+if (MINGW)
+ # Avoid depending on MinGW runtime DLLs
+ check_cxx_compiler_flag (-static-libgcc HAVE_STATIC_LIBGCC_FLAG)
+ if (HAVE_STATIC_LIBGCC_FLAG)
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc")
+ endif ()
+ check_cxx_compiler_flag (-static-libstdc++ HAVE_STATIC_LIBSTDCXX_FLAG)
+ if (HAVE_STATIC_LIBSTDCXX_FLAG)
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++")
+ endif ()
+endif ()
+
# Put all executables into the same top level build directory, regardless of
# which subdirectory they are declared
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+##############################################################################
+# Installation directories
+
+if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
+ set (DOC_INSTALL_DIR doc)
+else ()
+ set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+endif ()
+
+set (LIB_INSTALL_DIR lib/apitrace)
+
+if (APPLE)
+ # MacOSX uses fat binaries, so no need to have per-architecture wrapper
+ # directories
+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+else ()
+ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}/${CMAKE_SYSTEM_PROCESSOR})
+endif ()
+
+set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
+set(WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
+
+# Expose the binary/install directories to source
+#
+# TODO: Use the same directory layout, for both build and install directories,
+# so that binaries can find each other using just relative paths.
+#
+add_definitions(
+ -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
+ -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
+ -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
+ -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
+)
+
+
##############################################################################
# Common libraries / utilities
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
- DEPENDS glproc.py dispatch.py wglapi.py glxapi.py cglapi.py glapi.py gltypes.py stdapi.py
+ DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py
)
if (WIN32)
set (os os_win32.cpp)
- set (glws glws_wgl.cpp)
-else (WIN32)
+ set (glws_os glws_wgl.cpp)
+else ()
set (os os_posix.cpp)
- set (glws glws_glx.cpp)
-endif (WIN32)
+ if (APPLE)
+ set (glws_os glws_cocoa.mm)
+ else ()
+ set (glws_os glws_glx.cpp)
+ endif ()
+endif ()
-add_library (common
+add_library (common STATIC
common/trace_file.cpp
- common/trace_snappyfile.cpp
+ common/trace_file_zlib.cpp
+ common/trace_file_snappy.cpp
common/trace_model.cpp
common/trace_parser.cpp
common/trace_writer.cpp
- common/trace_local_writer.cpp
- common/trace_model_writer.cpp
+ common/trace_writer_local.cpp
+ common/trace_writer_model.cpp
common/trace_loader.cpp
+ common/trace_tools_trace.cpp
common/image.cpp
common/image_bmp.cpp
common/image_pnm.cpp
set_target_properties (common PROPERTIES
# Ensure it can be statically linked in shared libraries
- COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}"
+ COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}"
)
link_libraries (common)
-add_executable (tracedump tracedump.cpp)
-install (TARGETS tracedump RUNTIME DESTINATION bin)
-
##############################################################################
# API tracers
if (WIN32)
+ if (MINGW)
+ # Silence warnings about @nn suffix mismatch
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
+ endif (MINGW)
+
# ddraw.dll
if (DirectX_D3D_INCLUDE_DIR)
include_directories (SYSTEM ${DirectX_D3D_INCLUDE_DIR})
add_custom_command (
OUTPUT ddrawtrace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ddrawtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/ddrawtrace.cpp
- DEPENDS ddrawtrace.py d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
+ DEPENDS ddrawtrace.py trace.py specs/d3d.py specs/d3dtypes.py specs/d3dcaps.py specs/ddraw.py specs/winapi.py specs/stdapi.py
)
- add_library (ddraw MODULE ddraw.def ddrawtrace.cpp)
+ add_library (ddraw MODULE specs/ddraw.def ddrawtrace.cpp)
set_target_properties (ddraw
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS ddraw LIBRARY DESTINATION wrappers)
+ install (TARGETS ddraw LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif (DirectX_D3D_INCLUDE_DIR)
# d3d8.dll
add_custom_command (
OUTPUT d3d8trace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8trace.cpp
- DEPENDS d3d8trace.py d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
+ DEPENDS d3d8trace.py trace.py specs/d3d8.py specs/d3d8types.py specs/d3d8caps.py specs/winapi.py specs/stdapi.py
)
- add_library (d3d8 MODULE d3d8.def d3d8trace.cpp d3dshader.cpp)
+ add_library (d3d8 MODULE specs/d3d8.def d3d8trace.cpp d3dshader.cpp)
set_target_properties (d3d8
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS d3d8 LIBRARY DESTINATION wrappers)
+ install (TARGETS d3d8 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
# d3d9.dll
add_custom_command (
OUTPUT d3d9trace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9trace.cpp
- DEPENDS d3d9trace.py d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
+ DEPENDS d3d9trace.py trace.py specs/d3d9.py specs/d3d9types.py specs/d3d9caps.py specs/winapi.py specs/stdapi.py
)
- add_library (d3d9 MODULE d3d9.def d3d9trace.cpp d3dshader.cpp)
+ add_library (d3d9 MODULE specs/d3d9.def d3d9trace.cpp d3dshader.cpp)
set_target_properties (d3d9
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS d3d9 LIBRARY DESTINATION wrappers)
+ install (TARGETS d3d9 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif (DirectX_D3DX9_INCLUDE_DIR)
# d3d10.dll
add_custom_command (
OUTPUT d3d10trace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
- DEPENDS d3d10trace.py d3d10misc.py d3d10.py dxgi.py winapi.py stdapi.py
+ DEPENDS d3d10trace.py trace.py specs/d3d10misc.py specs/d3d10.py specs/dxgi.py specs/dxgitype.py specs/dxgiformat.py specs/winapi.py specs/stdapi.py
+ )
+ add_library (d3d10 MODULE specs/d3d10.def d3d10trace.cpp)
+ set_target_properties (d3d10
+ PROPERTIES PREFIX ""
+ RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+ LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- add_library (d3d10 MODULE d3d10.def d3d10trace.cpp)
- set_target_properties (d3d10 PROPERTIES PREFIX "")
- install (TARGETS d3d10 LIBRARY DESTINATION wrappers)
+ install (TARGETS d3d10 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif (DirectX_D3D10_INCLUDE_DIR)
# opengl32.dll
add_custom_command (
OUTPUT wgltrace.cpp
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
+ DEPENDS wgltrace.py gltrace.py trace.py specs/wglapi.py specs/wglenum.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/winapi.py specs/stdapi.py
)
- add_library (wgltrace MODULE opengl32.def
+ add_library (wgltrace MODULE specs/opengl32.def
wgltrace.cpp
glcaps.cpp
${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- if (MINGW)
- set_target_properties(wgltrace PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.def")
- endif (MINGW)
- install (TARGETS wgltrace LIBRARY DESTINATION wrappers)
+ install (TARGETS wgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
elseif (APPLE)
# OpenGL framework
add_custom_command (
OUTPUT cgltrace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/cgltrace.cpp
- DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py
+ DEPENDS cgltrace.py gltrace.py trace.py specs/cglapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py
)
add_library (cgltrace SHARED
target_link_libraries (cgltrace dl)
- install (TARGETS cgltrace LIBRARY DESTINATION wrappers)
+ install (TARGETS cgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
else ()
# libGL.so
add_custom_command (
OUTPUT glxtrace.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glxtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glxtrace.cpp
- DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py
+ DEPENDS glxtrace.py gltrace.py trace.py specs/glxapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py
)
add_library (glxtrace SHARED
set_target_properties (glxtrace PROPERTIES
# avoid the default "lib" prefix
PREFIX ""
- )
-
- # Prevent symbol relocations internal to our wrapper library to be
- # overwritten by the application.
- set_target_properties (glxtrace PROPERTIES
+ # Prevent symbol relocations internal to our wrapper library to be
+ # overwritten by the application.
LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions"
+ RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
+ LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
target_link_libraries (glxtrace dl ${X11_X11_LIB})
- install (TARGETS glxtrace LIBRARY DESTINATION lib)
+ install (TARGETS glxtrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif ()
add_custom_command (
OUTPUT glretrace_gl.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
- DEPENDS glretrace.py retrace.py codegen.py glapi.py gltypes.py stdapi.py
+ DEPENDS glretrace.py retrace.py specs/glapi.py specs/gltypes.py specs/stdapi.py
)
add_custom_command (
OUTPUT glstate_params.cpp
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate_params.cpp
- DEPENDS glstate.py glparams.py gltypes.py stdapi.py
+ DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py
)
include_directories (
glstate.cpp
glstate_params.cpp
retrace.cpp
- ${glws}
+ retrace_stdc.cpp
+ glws.cpp
+ ${glws_os}
${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
)
if (WIN32)
target_link_libraries (glretrace ${OPENGL_gl_LIBRARY})
elseif (APPLE)
- # XXX: We use GLX on MacOSX, which is in a separate library.
target_link_libraries (glretrace
- ${X11_GL_LIB}
- ${X11_X11_LIB}
+ "-framework Cocoa"
"-framework ApplicationServices" # CGS*
${OPENGL_gl_LIBRARY} # CGL*
)
install (TARGETS glretrace RUNTIME DESTINATION bin)
+##############################################################################
+# CLI
+
+add_subdirectory(cli)
+
+##############################################################################
+# Scripts (to support the CLI)
+
+install (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.sh DESTINATION ${LIB_INSTALL_DIR}/scripts)
##############################################################################
# GUI
NEWS.markdown
README.markdown
TODO.markdown
- DESTINATION doc)
+ DESTINATION ${DOC_INSTALL_DIR}
+)
-set (CPACK_PACKAGE_VERSION_MAJOR "1")
+set (CPACK_PACKAGE_VERSION_MAJOR "2")
set (CPACK_PACKAGE_VERSION_MINOR "0")
# Use current date in YYYYMMDD format as patch number
projects / apitrace / blobdiff