X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=f25a5ddfb54e2b23c93050babd3afdf485b639ca;hb=ccb51563399e699c50f5166d4d14fdc0f25d9292;hp=fc331b6c8b9a63faaa9e1df4562a82525c84e81b;hpb=2e08f33622bcb9e9da2e994da311fd44eeb62e6d;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index fc331b6..f25a5dd 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") @@ -238,6 +241,7 @@ add_definitions( # Common libraries / utilities include_directories ( + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common ) @@ -248,6 +252,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) @@ -261,6 +270,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 @@ -378,8 +388,8 @@ if (WIN32) wgltrace.cpp glcaps.cpp glproc_gl.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) + add_dependencies (wgltrace glproc) set_target_properties (wgltrace PROPERTIES PREFIX "" OUTPUT_NAME opengl32 @@ -400,9 +410,10 @@ elseif (APPLE) cgltrace.cpp glcaps.cpp glproc_gl.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) + add_dependencies (cgltrace glproc) + set_target_properties (cgltrace PROPERTIES # OpenGL framework name PREFIX "" OUTPUT_NAME "OpenGL" SUFFIX "" @@ -412,10 +423,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 @@ -424,12 +438,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 "" @@ -440,7 +455,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 () @@ -451,16 +470,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 @@ -477,7 +497,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 () @@ -497,11 +520,6 @@ add_custom_command ( DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) -include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} - ${OPENGL_INCLUDE_PATH} -) - set (retrace_sources glretrace_gl.cpp glretrace_cgl.cpp @@ -514,52 +532,60 @@ set (retrace_sources retrace.cpp retrace_stdc.cpp glws.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) -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} pthread) 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 @@ -571,6 +597,7 @@ if (EGL_FOUND AND NOT WIN32 AND NOT APPLE) common ${X11_X11_LIB} pthread + dl ) install (TARGETS eglretrace RUNTIME DESTINATION bin)