X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=177c82b8a83b7abd24ddd4bc3ae2d62ef933bf64;hb=946da143b5fa8b5babddd5668743e4048bf08e7d;hp=c7f3a449249e2377024987a181d0d373369a5b80;hpb=8167c0f1786f0b5795d76b86e6a2bbb51bc08760;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index c7f3a44..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,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,8 @@ endif () # For glext headers include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +# For EGL headers +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr) ############################################################################## # Installation directories @@ -191,14 +209,19 @@ 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 (WRAPPER_INSTALL_DIR lib/apitrace) + set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) else () - set (WRAPPER_INSTALL_DIR lib/apitrace/${CMAKE_SYSTEM_PROCESSOR}) + 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, @@ -215,6 +238,7 @@ add_definitions( # Common libraries / utilities include_directories ( + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common ) @@ -222,9 +246,14 @@ 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_os glws_wgl.cpp) @@ -238,15 +267,21 @@ else () endif () add_library (common STATIC + common/trace_dump.cpp common/trace_file.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_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 @@ -255,6 +290,7 @@ 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}" ) @@ -348,8 +384,9 @@ 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 @@ -369,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 "" @@ -393,12 +432,13 @@ 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 "" @@ -415,6 +455,43 @@ else () 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 @@ -430,26 +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 retrace_stdc.cpp glws.cpp +) + +add_executable (glretrace + ${retrace_sources} ${glws_os} - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp + glproc_gl.cpp ) +add_dependencies (glretrace glproc) + set_property ( TARGET glretrace APPEND @@ -461,24 +540,70 @@ target_link_libraries (glretrace ) if (WIN32) - target_link_libraries (glretrace ${OPENGL_gl_LIBRARY}) -elseif (APPLE) +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 - "-framework Cocoa" - "-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