X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=710c626ec7dbc465c626e137c2aac754038fc478;hb=e9426dd61586757d23d7dddc85b3076f477e7f07;hp=e01da79db4bf01503237c4a9f13912b70f93112b;hpb=aa5681e4e7a6c0b60cf4bd05a1b80181c98547f7;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index e01da79..710c626 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,14 @@ endif () # prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml set (ENABLE_GUI "AUTO" CACHE STRING "Enable Qt GUI.") +set (ENABLE_EGL "AUTO" CACHE STRING "Enable EGL support.") + ############################################################################## # Find dependencies +include (FindPkgConfig) + set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set (CMAKE_USE_PYTHON_VERSION 2.7 2.6) @@ -36,16 +40,28 @@ if (ENABLE_GUI) find_package (QJSON ${REQUIRE_GUI}) endif () +include_directories (${OPENGL_INCLUDE_DIR}) + if (WIN32) find_package (DirectX) elseif (APPLE) else () find_package (X11 REQUIRED) - set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) - set (X11_GL_LIB ${OPENGL_gl_LIBRARY}) - include_directories (${X11_INCLUDE_DIR}) + + if (ENABLE_EGL) + if (NOT ENABLE_EGL STREQUAL "AUTO") + set (REQUIRE_EGL REQUIRED) + endif () + pkg_check_modules (EGL egl glesv1_cm glesv2 ${REQUIRE_EGL}) + if (EGL_FOUND) + include_directories (${EGL_INCLUDE_DIR}) + add_definitions (-DHAVE_EGL) + endif () + else () + set (EGL_FOUND 0) + endif () endif () @@ -179,6 +195,44 @@ endif () # For glext headers include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +# For EGL headers +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr) + +############################################################################## +# 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_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}" +) + ############################################################################## # Common libraries / utilities @@ -191,7 +245,7 @@ include_directories ( 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 specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py + DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/eglapi.py specs/glesapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py ) if (WIN32) @@ -208,13 +262,19 @@ endif () add_library (common STATIC common/trace_file.cpp - common/trace_snappyfile.cpp + common/trace_file_read.cpp + common/trace_file_write.cpp + common/trace_file_zlib.cpp + common/trace_file_snappy.cpp common/trace_model.cpp common/trace_parser.cpp + common/trace_parser_flags.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_resource.cpp + common/trace_tools_trace.cpp common/image.cpp common/image_bmp.cpp common/image_pnm.cpp @@ -223,15 +283,13 @@ add_library (common STATIC ) set_target_properties (common PROPERTIES + COMPILE_DEFINITIONS APITRACE_SOURCE_DIR="${CMAKE_SOURCE_DIR}" # Ensure it can be statically linked in shared libraries COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}" ) link_libraries (common) -add_executable (tracedump tracedump.cpp) -install (TARGETS tracedump RUNTIME DESTINATION bin) - ############################################################################## # API tracers @@ -256,7 +314,7 @@ if (WIN32) 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 @@ -273,7 +331,7 @@ if (WIN32) 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 @@ -290,7 +348,7 @@ if (WIN32) 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 @@ -307,7 +365,7 @@ if (WIN32) RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - install (TARGETS d3d10 LIBRARY DESTINATION wrappers) + install (TARGETS d3d10 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif (DirectX_D3D10_INCLUDE_DIR) # opengl32.dll @@ -319,6 +377,7 @@ if (WIN32) add_library (wgltrace MODULE specs/opengl32.def wgltrace.cpp glcaps.cpp + glproc_gl.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) set_target_properties (wgltrace PROPERTIES @@ -327,7 +386,7 @@ if (WIN32) RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - install (TARGETS wgltrace LIBRARY DESTINATION wrappers) + install (TARGETS wgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) elseif (APPLE) # OpenGL framework @@ -340,6 +399,7 @@ elseif (APPLE) add_library (cgltrace SHARED cgltrace.cpp glcaps.cpp + glproc_gl.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) @@ -354,7 +414,7 @@ elseif (APPLE) 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 ( @@ -367,26 +427,61 @@ else () ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp glxtrace.cpp glcaps.cpp - glsnapshot.cpp + glproc_gl.cpp ) 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 () +if (EGL_FOUND) + # libEGL.so/libGL.so + add_custom_command ( + OUTPUT egltrace.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/egltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/egltrace.cpp + DEPENDS egltrace.py gltrace.py trace.py specs/eglapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py + ) + + add_library (egltrace SHARED + ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp + egltrace.cpp + glcaps.cpp + glproc_egl.cpp + ) + + set_property ( + TARGET egltrace + APPEND + PROPERTY COMPILE_DEFINITIONS "TRACE_EGL" + ) + + set_target_properties (egltrace PROPERTIES + # avoid the default "lib" prefix + PREFIX "" + LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions" + # Prevent symbol relocations internal to our wrapper library to be + # overwritten by the application. + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + ) + + target_link_libraries (egltrace dl) + + install (TARGETS egltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) +endif () + ############################################################################## # API retracers @@ -407,20 +502,27 @@ include_directories ( ${OPENGL_INCLUDE_PATH} ) -add_executable (glretrace +set (retrace_sources glretrace_gl.cpp glretrace_cgl.cpp glretrace_glx.cpp glretrace_wgl.cpp + glretrace_egl.cpp glretrace_main.cpp glstate.cpp glstate_params.cpp retrace.cpp + retrace_stdc.cpp glws.cpp - ${glws_os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) +add_executable (glretrace + ${retrace_sources} + ${glws_os} + glproc_gl.cpp +) + set_property ( TARGET glretrace APPEND @@ -432,7 +534,6 @@ target_link_libraries (glretrace ) if (WIN32) - target_link_libraries (glretrace ${OPENGL_gl_LIBRARY}) elseif (APPLE) target_link_libraries (glretrace "-framework Cocoa" @@ -440,11 +541,51 @@ elseif (APPLE) ${OPENGL_gl_LIBRARY} # CGL* ) else () - target_link_libraries (glretrace ${OPENGL_gl_LIBRARY} ${X11_X11_LIB}) + target_link_libraries (glretrace ${X11_X11_LIB}) endif () install (TARGETS glretrace RUNTIME DESTINATION bin) +if (EGL_FOUND AND NOT WIN32 AND NOT APPLE) + add_executable (eglretrace + ${retrace_sources} + glws_egl_xlib.cpp + glproc_egl.cpp + ) + + set_property ( + TARGET eglretrace + APPEND + PROPERTY COMPILE_DEFINITIONS "RETRACE" + PROPERTY COMPILE_DEFINITIONS "TRACE_EGL" + ) + + target_link_libraries (eglretrace + common + ) + + target_link_libraries (eglretrace + ${X11_X11_LIB} + ) + + install (TARGETS eglretrace RUNTIME DESTINATION bin) +endif () + +############################################################################## +# CLI + +add_subdirectory(cli) + +############################################################################## +# Scripts (to support the CLI) + +install ( + PROGRAMS + ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.sh + ${CMAKE_CURRENT_SOURCE_DIR}/scripts/jsondiff.py + ${CMAKE_CURRENT_SOURCE_DIR}/scripts/snapdiff.py + DESTINATION ${SCRIPTS_INSTALL_DIR} +) ############################################################################## # GUI @@ -464,7 +605,8 @@ install ( NEWS.markdown README.markdown TODO.markdown - DESTINATION doc) + DESTINATION ${DOC_INSTALL_DIR} +) set (CPACK_PACKAGE_VERSION_MAJOR "2") set (CPACK_PACKAGE_VERSION_MINOR "0")