X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=24e2afc06bcdeb5e52a6e8ccb7ce9f3e1a2851de;hb=ddbf8c0065ce1b7502e3e127a846add476ab7a4c;hp=270c2ef18b56ede69bd483e27e76459d138bf1b4;hpb=dc92162939bda50fae79e139f599a4c3e8b95047;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index 270c2ef..24e2afc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,9 +46,12 @@ if (WIN32) find_package (DirectX) elseif (APPLE) else () - find_package (X11 REQUIRED) + find_package (X11) - include_directories (${X11_INCLUDE_DIR}) + if (X11_FOUND) + include_directories (${X11_INCLUDE_DIR}) + add_definitions (-DHAVE_X11) + endif () if (ENABLE_EGL) if (NOT ENABLE_EGL STREQUAL "AUTO") @@ -186,14 +189,15 @@ link_libraries (${PNG_LIBRARIES}) # AUTO. if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO")) add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL) - set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/qjson) + set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) set (QJSON_LIBRARY_DIRS) set (QJSON_LIBRARIES qjson_bundled) set (QJSON_FOUND TRUE) endif () -# For glext headers -include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +# For glext headers. Needs to be before system includes as often system's GL +# headers bundle and include glext.h and glxext.h +include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glext) # For EGL headers include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr) @@ -249,6 +253,11 @@ add_custom_command ( 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) @@ -262,6 +271,7 @@ else () endif () add_library (common STATIC + common/trace_dump.cpp common/trace_file.cpp common/trace_file_read.cpp common/trace_file_write.cpp @@ -376,11 +386,11 @@ if (WIN32) 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 specs/opengl32.def - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp wgltrace.cpp glcaps.cpp glproc_gl.cpp ) + add_dependencies (wgltrace glproc) set_target_properties (wgltrace PROPERTIES PREFIX "" OUTPUT_NAME opengl32 @@ -398,12 +408,13 @@ elseif (APPLE) ) add_library (cgltrace SHARED - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp cgltrace.cpp glcaps.cpp glproc_gl.cpp ) + add_dependencies (cgltrace glproc) + set_target_properties (cgltrace PROPERTIES # OpenGL framework name PREFIX "" OUTPUT_NAME "OpenGL" SUFFIX "" @@ -413,10 +424,13 @@ elseif (APPLE) LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - target_link_libraries (cgltrace dl) + target_link_libraries (cgltrace + pthread + dl + ) install (TARGETS cgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) -else () +elseif (X11_FOUND) # libGL.so add_custom_command ( OUTPUT glxtrace.cpp @@ -425,12 +439,13 @@ else () ) add_library (glxtrace SHARED - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp glxtrace.cpp glcaps.cpp glproc_gl.cpp ) + add_dependencies (glxtrace glproc) + set_target_properties (glxtrace PROPERTIES # avoid the default "lib" prefix PREFIX "" @@ -441,7 +456,11 @@ else () LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - target_link_libraries (glxtrace dl ${X11_X11_LIB}) + target_link_libraries (glxtrace + ${X11_X11_LIB} + pthread + dl + ) install (TARGETS glxtrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif () @@ -452,16 +471,17 @@ if (EGL_FOUND) 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 + DEPENDS egltrace.py gltrace.py trace.py specs/eglapi.py specs/glesapi.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 ) + add_dependencies (egltrace glproc) + set_property ( TARGET egltrace APPEND @@ -478,7 +498,10 @@ if (EGL_FOUND) LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - target_link_libraries (egltrace dl) + target_link_libraries (egltrace + pthread + dl + ) install (TARGETS egltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif () @@ -499,7 +522,6 @@ add_custom_command ( ) set (retrace_sources - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp glretrace_gl.cpp glretrace_cgl.cpp glretrace_glx.cpp @@ -513,49 +535,63 @@ set (retrace_sources glws.cpp ) -add_executable (glretrace - ${retrace_sources} - ${glws_os} - glproc_gl.cpp -) +if (WIN32 OR APPLE OR X11_FOUND) + add_executable (glretrace + ${retrace_sources} + ${glws_os} + glproc_gl.cpp + ) -set_property ( - TARGET glretrace - APPEND - PROPERTY COMPILE_DEFINITIONS "RETRACE" -) + add_dependencies (glretrace glproc) -target_link_libraries (glretrace - common -) + set_property ( + TARGET glretrace + APPEND + PROPERTY COMPILE_DEFINITIONS "RETRACE" + ) + + target_link_libraries (glretrace + common + ) + + if (WIN32) + 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 () -if (WIN32) -else () - if (APPLE) 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 ${X11_X11_LIB}) + + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + target_link_libraries (glretrace rt) + endif () + endif () - # 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 - target_link_libraries (glretrace pthread) + install (TARGETS glretrace RUNTIME DESTINATION bin) endif () -install (TARGETS glretrace RUNTIME DESTINATION bin) - -if (EGL_FOUND AND NOT WIN32 AND NOT APPLE) +if (EGL_FOUND AND X11_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 @@ -567,8 +603,13 @@ if (EGL_FOUND AND NOT WIN32 AND NOT APPLE) common ${X11_X11_LIB} pthread + dl ) + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + target_link_libraries (eglretrace rt) + endif () + install (TARGETS eglretrace RUNTIME DESTINATION bin) endif ()