X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=177c82b8a83b7abd24ddd4bc3ae2d62ef933bf64;hb=946da143b5fa8b5babddd5668743e4048bf08e7d;hp=e31f753be894eac7fd284d3b9fe208801b74aeb9;hpb=5971d6a409e88044672911d960b355a425db7479;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index e31f753..177c82b 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,34 +40,29 @@ if (ENABLE_GUI) find_package (QJSON ${REQUIRE_GUI}) endif () -if (NOT WIN32) - find_package (X11 REQUIRED) +include_directories (${OPENGL_INCLUDE_DIR}) - # 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 () +if (WIN32) + find_package (DirectX) +elseif (APPLE) +else () + find_package (X11 REQUIRED) include_directories (${X11_INCLUDE_DIR}) -endif (NOT WIN32) -if (WIN32) - find_package (DirectX) -endif (WIN32) + 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 () ############################################################################## @@ -123,6 +122,22 @@ else () 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 @@ -180,11 +195,50 @@ 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 include_directories ( + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common ) @@ -192,26 +246,42 @@ 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 ) +# Wrap glproc.hpp as a target to prevent the command from being executed +# multiple times simulatenously, when the targets that depend on it are built +# in parallel. +add_custom_target (glproc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp) + 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_dump.cpp 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 @@ -220,20 +290,23 @@ add_library (common ) 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_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}) @@ -248,7 +321,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 @@ -265,7 +338,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 @@ -282,7 +355,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 @@ -291,11 +364,15 @@ if (WIN32) add_custom_command ( OUTPUT d3d10trace.cpp COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp - DEPENDS d3d10trace.py trace.py d3d10misc.py specs/d3d10.py specs/dxgi.py specs/winapi.py specs/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 "") - install (TARGETS d3d10 LIBRARY DESTINATION wrappers) + set_target_properties (d3d10 + PROPERTIES PREFIX "" + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + ) + install (TARGETS d3d10 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif (DirectX_D3D10_INCLUDE_DIR) # opengl32.dll @@ -307,18 +384,16 @@ if (WIN32) add_library (wgltrace MODULE specs/opengl32.def wgltrace.cpp glcaps.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp + glproc_gl.cpp ) + add_dependencies (wgltrace glproc) set_target_properties (wgltrace PROPERTIES PREFIX "" OUTPUT_NAME opengl32 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") - endif (MINGW) - install (TARGETS wgltrace LIBRARY DESTINATION wrappers) + install (TARGETS wgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) elseif (APPLE) # OpenGL framework @@ -331,9 +406,11 @@ elseif (APPLE) add_library (cgltrace SHARED cgltrace.cpp glcaps.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp + glproc_gl.cpp ) + add_dependencies (cgltrace glproc) + set_target_properties (cgltrace PROPERTIES # OpenGL framework name PREFIX "" OUTPUT_NAME "OpenGL" SUFFIX "" @@ -345,7 +422,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 ( @@ -355,36 +432,73 @@ else () ) add_library (glxtrace SHARED - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp glxtrace.cpp glcaps.cpp - glsnapshot.cpp + glproc_gl.cpp ) + add_dependencies (glxtrace glproc) + 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 + egltrace.cpp + glcaps.cpp + glproc_egl.cpp + ) + + add_dependencies (egltrace glproc) + + 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 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 specs/glapi.py specs/gltypes.py specs/stdapi.py + DEPENDS glretrace.py retrace.py specs/glapi.py specs/gltypes.py specs/stdapi.py ) add_custom_command ( @@ -393,24 +507,28 @@ add_custom_command ( DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) -include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} - ${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 - ${glws} - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp + retrace_stdc.cpp + glws.cpp +) + +add_executable (glretrace + ${retrace_sources} + ${glws_os} + glproc_gl.cpp ) +add_dependencies (glretrace glproc) + set_property ( TARGET glretrace APPEND @@ -422,21 +540,69 @@ target_link_libraries (glretrace ) if (WIN32) - target_link_libraries (glretrace ${OPENGL_gl_LIBRARY}) -elseif (APPLE) - # XXX: We use GLX on MacOSX, which is in a separate library. +else () + if (APPLE) + target_link_libraries (glretrace + "-framework Cocoa" + "-framework ApplicationServices" # CGS* + ${OPENGL_gl_LIBRARY} # CGL* + ) + else () + target_link_libraries (glretrace ${X11_X11_LIB}) + endif () + target_link_libraries (glretrace - ${X11_GL_LIB} - ${X11_X11_LIB} - "-framework ApplicationServices" # CGS* - ${OPENGL_gl_LIBRARY} # CGL* + # gdb doesn't like when pthreads is loaded through dlopen (which happens + # when dlopen'ing libGL), so link pthreads to avoid this issue. See also + # http://stackoverflow.com/questions/2702628/gdb-cannot-find-new-threads-generic-error + pthread + dl ) -else () - target_link_libraries (glretrace ${OPENGL_gl_LIBRARY} ${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 + ) + + add_dependencies (eglretrace glproc) + + set_property ( + TARGET eglretrace + APPEND + PROPERTY COMPILE_DEFINITIONS "RETRACE" + PROPERTY COMPILE_DEFINITIONS "TRACE_EGL" + ) + + target_link_libraries (eglretrace + common + ${X11_X11_LIB} + pthread + dl + ) + + 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 @@ -456,9 +622,10 @@ install ( 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