cmake: Link (e)glretrace against dl.

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a98103f23f22719d8249c27824b4ff4359733ed4..09386aa2a6a699c2f25572b9502e9258aeb0b2ce 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,22 +40,21 @@ 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 ${REQUIRE_EGL})
+        pkg_check_modules (EGL egl glesv1_cm glesv2 ${REQUIRE_EGL})
         if (EGL_FOUND)
             include_directories (${EGL_INCLUDE_DIR})
             add_definitions (-DHAVE_EGL)
@@ -231,7 +230,6 @@ set(WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
 add_definitions(
     -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
-    -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
     -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
 )
 
@@ -240,6 +238,7 @@ add_definitions(
 # Common libraries / utilities
 
 include_directories (
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/common
 )
@@ -250,6 +249,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)
@@ -264,14 +268,18 @@ endif ()
 
 add_library (common STATIC
     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
@@ -281,6 +289,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}"
 )
@@ -374,8 +383,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
@@ -395,9 +405,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 ""
@@ -419,11 +431,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 ""
@@ -449,11 +463,13 @@ if (EGL_FOUND)
     )
 
     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
@@ -490,11 +506,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
@@ -507,14 +518,16 @@ 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
 )
 
+add_dependencies (glretrace glproc)
+
 set_property (
     TARGET glretrace
     APPEND
@@ -526,15 +539,24 @@ 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) 
@@ -543,8 +565,11 @@ 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
@@ -554,12 +579,9 @@ if (EGL_FOUND AND NOT WIN32 AND NOT APPLE)
 
     target_link_libraries (eglretrace
         common
-    )
-
-    target_link_libraries (eglretrace
-        ${EGL_LIBRARIES}
-        ${OPENGL_gl_LIBRARY}
         ${X11_X11_LIB}
+        pthread
+        dl
     )
 
     install (TARGETS eglretrace RUNTIME DESTINATION bin) 
@@ -573,8 +595,13 @@ add_subdirectory(cli)
 ##############################################################################
 # Scripts (to support the CLI)
 
-install (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.sh DESTINATION ${LIB_INSTALL_DIR}/scripts)
-install (PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/jsondiff.py DESTINATION ${LIB_INSTALL_DIR}/scripts)
+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