# 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.")
+set (ENABLE_CLI true CACHE BOOL "Enable command Line interface.")
+
+set (ENABLE_EGL true CACHE BOOL "Enable EGL support.")
##############################################################################
# Find dependencies
-include (FindPkgConfig)
-
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
set (CMAKE_USE_PYTHON_VERSION 2.7 2.6)
find_package (PythonInterp REQUIRED)
-find_package (OpenGL REQUIRED)
+
+find_package (Threads)
if (ENABLE_GUI)
if (NOT (ENABLE_GUI STREQUAL "AUTO"))
find_package (QJSON ${REQUIRE_GUI})
endif ()
-include_directories (${OPENGL_INCLUDE_DIR})
-
if (WIN32)
find_package (DirectX)
+ set (ENABLE_EGL false)
elseif (APPLE)
+ set (ENABLE_EGL false)
else ()
find_package (X11)
endif ()
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)
+ add_definitions (-DHAVE_EGL)
endif ()
endif ()
include (CheckCXXCompilerFlag)
if (WIN32)
- # MSVC & MinGW only define & use APIENTRY
- add_definitions (-DGLAPIENTRY=__stdcall)
-
# http://msdn.microsoft.com/en-us/library/aa383745.aspx
add_definitions (-D_WIN32_WINNT=0x0500 -DWINVER=0x0500)
else (WIN32)
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 EGL headers
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr)
+# We use bundled headers for all Khronos APIs, to guarantee support for both
+# OpenGL and OpenGL ES at build time, because the OpenGL and OpenGL ES 1 APIs
+# are so intertwined that conditional compilation extremely difficult. This
+# also avoids missing/inconsistent declarations in system headers.
+include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos)
##############################################################################
# Installation directories
# 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
#
endif ()
add_library (common STATIC
+ common/trace_callset.cpp
common/trace_dump.cpp
common/trace_file.cpp
common/trace_file_read.cpp
)
target_link_libraries (cgltrace
- pthread
+ ${CMAKE_THREAD_LIBS_INIT}
dl
)
target_link_libraries (glxtrace
${X11_X11_LIB}
- pthread
+ ${CMAKE_THREAD_LIBS_INIT}
dl
)
endif ()
-if (EGL_FOUND)
+if (ENABLE_EGL AND NOT WIN32 AND NOT APPLE)
# libEGL.so/libGL.so
add_custom_command (
OUTPUT egltrace.cpp
)
target_link_libraries (egltrace
- pthread
+ ${CMAKE_THREAD_LIBS_INIT}
dl
)
target_link_libraries (glretrace
"-framework Cocoa"
"-framework ApplicationServices" # CGS*
- ${OPENGL_gl_LIBRARY} # CGL*
+ #"-framework OpenGL" # CGL*
)
else ()
target_link_libraries (glretrace ${X11_X11_LIB})
# 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
+ ${CMAKE_THREAD_LIBS_INIT}
dl
)
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ target_link_libraries (glretrace rt)
+ endif ()
+
endif ()
install (TARGETS glretrace RUNTIME DESTINATION bin)
endif ()
-if (EGL_FOUND AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
+if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
add_executable (eglretrace
${retrace_sources}
glws_egl_xlib.cpp
target_link_libraries (eglretrace
common
${X11_X11_LIB}
- pthread
+ ${CMAKE_THREAD_LIBS_INIT}
dl
)
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ target_link_libraries (eglretrace rt)
+ endif ()
+
install (TARGETS eglretrace RUNTIME DESTINATION bin)
endif ()
##############################################################################
# CLI
-add_subdirectory(cli)
+if (ENABLE_CLI)
+ add_subdirectory(cli)
+endif ()
##############################################################################
# Scripts (to support the CLI)
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}
LICENSE
NEWS.markdown
README.markdown
- TODO.markdown
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