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")
add_definitions (${PNG_DEFINITIONS})
link_libraries (${PNG_LIBRARIES})
+if (MSVC)
+ add_subdirectory (thirdparty/getopt EXCLUDE_FROM_ALL)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/getopt)
+ set (GETOPT_LIBRARIES getopt_bundled)
+endif ()
+
# The Qt website provides binaries for Windows and MacOSX, and they are
# automatically found by cmake without any manual intervention. The situation
# for QJSON is substantially different: there are no binaries for QJSON
# 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)
# On Windows/MacOSX, applications are usually installed on a directory of
# their own
set (DOC_INSTALL_DIR doc)
+ set (LIB_INSTALL_DIR lib)
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})
+ set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME})
endif ()
set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
-set(WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
+set(WRAPPER_INSTALL_DIR ${LIB_INSTALL_DIR}/wrappers)
# Expose the binary/install directories to source
#
# Common libraries / utilities
include_directories (
+ ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/common
)
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)
endif ()
add_library (common STATIC
+ common/trace_callset.cpp
+ common/trace_dump.cpp
common/trace_file.cpp
common/trace_file_read.cpp
common/trace_file_write.cpp
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
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 ""
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
)
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 ""
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 ()
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
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 ()
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
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)
+
+ 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
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 ()
install (
PROGRAMS
- ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.sh
+ ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.py
${CMAKE_CURRENT_SOURCE_DIR}/scripts/jsondiff.py
${CMAKE_CURRENT_SOURCE_DIR}/scripts/snapdiff.py
DESTINATION ${SCRIPTS_INSTALL_DIR}
DESTINATION ${DOC_INSTALL_DIR}
)
-set (CPACK_PACKAGE_VERSION_MAJOR "2")
+set (CPACK_PACKAGE_VERSION_MAJOR "3")
set (CPACK_PACKAGE_VERSION_MINOR "0")
# Use current date in YYYYMMDD format as patch number
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
)
+# cpack mistakenly detects Mingw-w64 as win32
+if (MINGW)
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set (CPACK_SYSTEM_NAME win64)
+ endif ()
+endif ()
+
# See http://www.vtk.org/Wiki/CMake:CPackPackageGenerators
if (WIN32)
set (CPACK_GENERATOR "ZIP")
projects / apitrace / blobdiff