X-Git-Url: https://git.cworth.org/git?p=apitrace;a=blobdiff_plain;f=CMakeLists.txt;h=ac046f51266e469184860c78fe4fa7975d758de5;hp=855d73fc1aa19fa923b48da87d01b72dc6c0d980;hb=HEAD;hpb=452d3256a3ba7f249222ef857d69c8caaaa753f3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 855d73f..ac046f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,14 @@ cmake_minimum_required (VERSION 2.8) + +# Use clang on MacOSX. gcc doesn't support __thread key, and Apple has +# abandoned it for clang. This must be done before the project is defined. +if (APPLE) + set (CMAKE_C_COMPILER "clang") + set (CMAKE_CXX_COMPILER "clang++") +endif () + + project (apitrace) @@ -25,6 +34,21 @@ set (ENABLE_EGL true CACHE BOOL "Enable EGL support.") ############################################################################## # Find dependencies +# Ensure __thread is support +if (NOT MSVC) + include (CheckCXXSourceCompiles) + check_cxx_source_compiles("__thread int i; int main() { return 0; }" HAVE_COMPILER_TLS) + if (NOT HAVE_COMPILER_TLS) + if (APPLE) + message (FATAL_ERROR "C++ compiler does not support __thread keyword. Please install XCode 4.5 or higher.") + else (MINGW32) + message (FATAL_ERROR "C++ compiler does not support __thread keyword. Please use MinGW g++ version 4.4 or higher") + else () + message (FATAL_ERROR "C++ compiler does not support __thread keyword.") + endif () + endif () +endif () + set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set (CMAKE_USE_PYTHON_VERSION 2.7 2.6) @@ -45,7 +69,6 @@ if (ENABLE_GUI) set (REQUIRE_GUI REQUIRED) endif () find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit ${REQUIRE_GUI}) - find_package (QJSON ${REQUIRE_GUI}) endif () if (WIN32) @@ -59,6 +82,10 @@ else () if (X11_FOUND) include_directories (${X11_INCLUDE_DIR}) add_definitions (-DHAVE_X11) + else () + # Print a clear message when X11 is not found + include (FindPackageMessage) + find_package_message (X11 "Could not find X11" "") endif () endif () @@ -70,7 +97,7 @@ include (CheckCXXCompilerFlag) if (WIN32) # http://msdn.microsoft.com/en-us/library/aa383745.aspx - add_definitions (-D_WIN32_WINNT=0x0500 -DWINVER=0x0500) + add_definitions (-D_WIN32_WINNT=0x0601 -DWINVER=0x0601) else (WIN32) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" CXX_COMPILER_FLAG_VISIBILITY) if (CXX_COMPILER_FLAG_VISIBILITY) @@ -79,8 +106,8 @@ else (WIN32) endif () if (MSVC) - # C99 includes for msvc - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msvc) + # C99 includes for MSVC + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msinttypes) # Enable math constants defines add_definitions (-D_USE_MATH_DEFINES) @@ -92,13 +119,15 @@ if (MSVC) add_definitions (-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions (-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) add_definitions (-W4) + # XXX: it's safer to use ssize_t everywhere instead of disabling warning + add_definitions (-wd4018) # signed/unsigned mismatch add_definitions (-wd4063) # not a valid value for switch of enum + add_definitions (-wd4100) # unreferenced formal parameter add_definitions (-wd4127) # conditional expression is constant add_definitions (-wd4244) # conversion from 'type1' to 'type2', possible loss of data add_definitions (-wd4505) # unreferenced local function has been removed + add_definitions (-wd4512) # assignment operator could not be generated add_definitions (-wd4800) # forcing value to bool 'true' or 'false' (performance warning) - # XXX: it's safer to use ssize_t everywhere instead of disabling warning - add_definitions (-wd4018) # signed/unsigned mismatch # Use static runtime # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F @@ -115,6 +144,19 @@ else () add_definitions (-Wall) # XXX: it's safer to use ssize_t everywhere instead of disabling warning add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions + + # Use GDB extensions if available + if (CMAKE_COMPILER_IS_GNUC) + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -O0") + set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb") + endif () + if (CMAKE_COMPILER_IS_GNUCXX) + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O0") + set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ggdb") + endif () + + # Be nice to Eclipse + add_definitions (-fmessage-length=0) endif () if (MINGW) @@ -139,6 +181,43 @@ endif () set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +############################################################################## +# Installation directories + +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + # Debian multiarch support + execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH + OUTPUT_VARIABLE ARCH_SUBDIR + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND) + if (READPROC_H_FOUND) + add_definitions (-DHAVE_READPROC_H) + find_library (proc_LIBRARY NAMES proc procps) + endif () +endif() + +if (WIN32 OR APPLE) + # On Windows/MacOSX, applications are usually installed on a directory of + # their own + set (DOC_INSTALL_DIR doc) + set (LIB_INSTALL_DIR lib) + set (LIB_ARCH_INSTALL_DIR lib) +else () + set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) + set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME}) + if (ARCH_SUBDIR) + set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) + else () + set (LIB_ARCH_INSTALL_DIR lib/${CMAKE_PROJECT_NAME}) + endif () +endif () + +set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) +set (WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers) + + ############################################################################## # Bundled dependencies # @@ -149,13 +228,13 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) set (ZLIB_LIBRARIES z_bundled) -add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL) +add_subdirectory (thirdparty/zlib) include_directories (${ZLIB_INCLUDE_DIRS}) set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) set (SNAPPY_LIBRARIES snappy_bundled) -add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL) +add_subdirectory (thirdparty/snappy) include_directories (${SNAPPY_INCLUDE_DIRS}) @@ -163,31 +242,26 @@ set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) set (PNG_DEFINITIONS "") set (PNG_LIBRARIES png_bundled) -add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL) -include_directories (${PNG_INCLUDE_DIR}) -add_definitions (${PNG_DEFINITIONS}) +add_subdirectory (thirdparty/libpng) if (MSVC) - add_subdirectory (thirdparty/getopt EXCLUDE_FROM_ALL) + add_subdirectory (thirdparty/getopt) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/getopt) set (GETOPT_LIBRARIES getopt_bundled) endif () if (WIN32) add_subdirectory (thirdparty/less) + add_subdirectory (thirdparty/directxtex) 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 -# available, and there is no standard installation directory that is detected -# by cmake. -# -# By bundling the QJSON source, we make it much more easier to build the GUI on -# Windows and MacOSX. But we only use the bundled sources when ENABLE_GUI is -# AUTO. -if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO")) - add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL) +# Always use bundled QJSon. +# - The packaged versions QJson are very old, and do not support NaN/Infinity. +# - To make it easier to build the GUI on Windows and MacOSX, as there are no +# binaries at all. +if (QT4_FOUND) + add_definitions (-DQJSON_EXPORT=) + add_subdirectory (thirdparty/qjson) set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) set (QJSON_LIBRARY_DIRS) set (QJSON_LIBRARIES qjson_bundled) @@ -200,33 +274,6 @@ endif () # also avoids missing/inconsistent declarations in system headers. include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos) -############################################################################## -# Installation directories - -if (WIN32 OR APPLE) - # 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}) - set (LIB_INSTALL_DIR lib/${CMAKE_PROJECT_NAME}) -endif () - -set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) -set(WRAPPER_INSTALL_DIR ${LIB_INSTALL_DIR}/wrappers) - -# Expose the binary/install directories to source -# -# TODO: Use the same directory layout, for both build and install directories, -# so that binaries can find each other using just relative paths. -# -add_definitions( - -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}" - -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" - -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}" -) - ############################################################################## # Common libraries / utilities @@ -237,17 +284,6 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/common ) -add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp - 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) @@ -263,6 +299,7 @@ endif () add_library (common STATIC common/trace_callset.cpp common/trace_dump.cpp + common/trace_fast_callset.cpp common/trace_file.cpp common/trace_file_read.cpp common/trace_file_write.cpp @@ -275,181 +312,41 @@ add_library (common STATIC 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 - common/image_pnm.cpp - common/image_png.cpp + common/trace_profiler.cpp + common/trace_option.cpp common/${os} ) 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}" ) if (ANDROID) - target_link_libraries (common log) + target_link_libraries (common + log + ) endif () ############################################################################## -# API tracers +# Sub-directories +add_subdirectory (dispatch) +add_subdirectory (helpers) add_subdirectory (wrappers) +add_subdirectory (image) +add_subdirectory (retrace) -############################################################################## -# API retracers - -add_custom_command ( - OUTPUT glretrace_gl.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp - DEPENDS glretrace.py retrace.py specs/glapi.py specs/gltypes.py specs/stdapi.py -) - -add_custom_command ( - OUTPUT glstate_params.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glstate_params.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate_params.cpp - DEPENDS glstate_params.py specs/glparams.py specs/gltypes.py specs/stdapi.py -) - -add_library (retrace_common - glretrace_gl.cpp - glretrace_cgl.cpp - glretrace_glx.cpp - glretrace_wgl.cpp - glretrace_egl.cpp - glretrace_main.cpp - glstate.cpp - glstate_images.cpp - glstate_params.cpp - glstate_shaders.cpp - retrace.cpp - retrace_stdc.cpp - glws.cpp -) - -add_dependencies (retrace_common glproc) - -set_property ( - TARGET retrace_common - APPEND - PROPERTY COMPILE_DEFINITIONS "RETRACE" -) - -if (WIN32 OR APPLE OR X11_FOUND) - add_executable (glretrace - ${glws_os} - glproc_gl.cpp - ) - - add_dependencies (glretrace glproc) - - set_property ( - TARGET glretrace - APPEND - PROPERTY COMPILE_DEFINITIONS "RETRACE" - ) - - target_link_libraries (glretrace - retrace_common - common - ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${SNAPPY_LIBRARIES} - ) - - if (WIN32) - else () - if (APPLE) - target_link_libraries (glretrace - "-framework Cocoa" - "-framework ApplicationServices" # CGS* - #"-framework OpenGL" # CGL* - ) - else () - target_link_libraries (glretrace ${X11_X11_LIB}) - endif () - - target_link_libraries (glretrace - # 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 - ${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 (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE) - add_executable (eglretrace - glws_egl_xlib.cpp - glproc_egl.cpp - ) - - add_dependencies (eglretrace glproc) - - set_property ( - TARGET eglretrace - APPEND - PROPERTY COMPILE_DEFINITIONS "RETRACE" - ) - - target_link_libraries (eglretrace - retrace_common - common - ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${SNAPPY_LIBRARIES} - ${X11_X11_LIB} - ${CMAKE_THREAD_LIBS_INIT} - dl - ) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - target_link_libraries (eglretrace rt) - endif () - - install (TARGETS eglretrace RUNTIME DESTINATION bin) -endif () - -if (WIN32 AND DirectX_D3DX9_FOUND) - add_custom_command ( - OUTPUT d3dretrace_d3d9.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3dretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp - DEPENDS d3dretrace.py retrace.py specs/d3d9.py specs/d3d9types.py specs/d3d9caps.py specs/winapi.py specs/stdapi.py - ) - - include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR}) - add_executable (d3dretrace - retrace.cpp - retrace_stdc.cpp - d3dretrace_main.cpp - d3dretrace_d3d9.cpp - ) - target_link_libraries (d3dretrace - common - ${ZLIB_LIBRARIES} - ${SNAPPY_LIBRARIES} - ${DirectX_D3D9_LIBRARY} - ) -endif () - ############################################################################## # CLI if (ENABLE_CLI) - add_subdirectory(cli) + if (WIN32) + add_subdirectory (inject) + endif () + add_subdirectory (cli) endif () ############################################################################## @@ -457,11 +354,22 @@ endif () install ( PROGRAMS - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/tracediff.py - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/jsondiff.py - ${CMAKE_CURRENT_SOURCE_DIR}/scripts/snapdiff.py + scripts/highlight.py + scripts/jsondiff.py + scripts/profileshader.py + scripts/retracediff.py + scripts/snapdiff.py + scripts/tracecheck.py + scripts/tracediff.py + scripts/unpickle.py DESTINATION ${SCRIPTS_INSTALL_DIR} ) +if (WIN32) + install ( + PROGRAMS scripts/convert.py + DESTINATION ${SCRIPTS_INSTALL_DIR} + ) +endif () ############################################################################## # GUI @@ -477,11 +385,22 @@ endif () install ( FILES BUGS.markdown - LICENSE NEWS.markdown README.markdown DESTINATION ${DOC_INSTALL_DIR} ) +install ( + FILES LICENSE + DESTINATION ${DOC_INSTALL_DIR} + RENAME LICENSE.txt +) +if (MSVC) + install ( + FILES thirdparty/msinttypes/LICENSE + DESTINATION ${DOC_INSTALL_DIR} + RENAME LICENSE-msinttypes.txt + ) +endif () set (CPACK_PACKAGE_VERSION_MAJOR "3") set (CPACK_PACKAGE_VERSION_MINOR "0")