X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=9721cdc3e6c653a7f2ae0ea7de203c43522b6fde;hb=26cca9bfe19d93624494bb316d8741aedbd5b82f;hp=8098441401bd10ea60249b923455a224d1c8e8a8;hpb=1b3d3752685cd15531c45e190c8ed55d31271127;p=apitrace diff --git a/CMakeLists.txt b/CMakeLists.txt index 8098441..9721cdc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,21 @@ cmake_minimum_required (VERSION 2.8) project (apitrace) +############################################################################## +# Options + +# On Mac OS X build fat binaries with i386 and x86_64 architectures by default. +if (APPLE AND NOT CMAKE_OSX_ARCHITECTURES) + set (CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for OSX" FORCE) +endif () + +# We use a cached string variable instead of the standard (boolean) OPTION +# command so that we can default to auto-detecting optional depencies, while +# still providing a mechanism to force/disable these optional dependencies, as +# prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml +set (ENABLE_GUI "AUTO" CACHE STRING "Enable Qt GUI.") + + ############################################################################## # Find dependencies @@ -12,37 +27,26 @@ set (CMAKE_USE_PYTHON_VERSION 2.7 2.6) find_package (PythonInterp REQUIRED) find_package (OpenGL REQUIRED) -find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit) -find_package (QJSON) - -if (NOT WIN32) - find_package (X11 REQUIRED) - # On Mac OS X, GLX is provided as a separate OpenGL implementation, different - # from the standard OpenGL framework which provides support for native Mac OS X - # applications. - if (APPLE) - find_path (X11_GL_INCLUDE_PATH GL/glx.h ${X11_INC_SEARCH_PATH}) - if (NOT X11_GL_INCLUDE_PATH) - message (SEND_ERROR "Could not find GL/glx.h") - endif (NOT X11_GL_INCLUDE_PATH) - set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_GL_INCLUDE_PATH}) - - find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH}) - if (NOT X11_GL_LIB) - message (SEND_ERROR "Could not find libGL.dylib") - endif (NOT X11_GL_LIB) - else () - set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) - set (X11_GL_LIB ${OPENGL_gl_LIBRARY}) +if (ENABLE_GUI) + if (NOT (ENABLE_GUI STREQUAL "AUTO")) + set (REQUIRE_GUI REQUIRED) endif () - - include_directories (${X11_INCLUDE_DIR}) -endif (NOT WIN32) + find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit ${REQUIRE_GUI}) + find_package (QJSON ${REQUIRE_GUI}) +endif () if (WIN32) find_package (DirectX) -endif (WIN32) +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}) +endif () ############################################################################## @@ -102,6 +106,22 @@ else () add_definitions (-Wno-sign-compare) # comparison between signed and unsigned integer expressions endif () +if (MINGW) + # Avoid depending on MinGW runtime DLLs + check_cxx_compiler_flag (-static-libgcc HAVE_STATIC_LIBGCC_FLAG) + if (HAVE_STATIC_LIBGCC_FLAG) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc") + set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc") + set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc") + endif () + check_cxx_compiler_flag (-static-libstdc++ HAVE_STATIC_LIBSTDCXX_FLAG) + if (HAVE_STATIC_LIBSTDCXX_FLAG) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++") + set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++") + set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++") + endif () +endif () + # Put all executables into the same top level build directory, regardless of # which subdirectory they are declared @@ -111,7 +131,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) ############################################################################## # Bundled dependencies # -# We always use the bundled zlib and libpng sources: +# We always use the bundled zlib, libpng, and snappy sources: # - on Windows to make it easy to deploy the wrappers DLLs # - on unices to prevent symbol collisions when tracing applications that link # against other versions of these libraries @@ -123,6 +143,13 @@ add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL) include_directories (${ZLIB_INCLUDE_DIRS}) link_libraries (${ZLIB_LIBRARIES}) +set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy) +set (SNAPPY_LIBRARIES snappy_bundled) +add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL) + +include_directories (${SNAPPY_INCLUDE_DIRS}) +link_libraries (${SNAPPY_LIBRARIES}) + set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) set (PNG_DEFINITIONS "") set (PNG_LIBRARIES png_bundled) @@ -132,125 +159,202 @@ include_directories (${PNG_INCLUDE_DIR}) add_definitions (${PNG_DEFINITIONS}) link_libraries (${PNG_LIBRARIES}) +# 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) + set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/qjson) + set (QJSON_LIBRARY_DIRS) + set (QJSON_LIBRARIES qjson_bundled) + set (QJSON_FOUND TRUE) +endif () + # For glext headers include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +############################################################################## +# Installation directories + +if (WIN32 OR APPLE) + # On Windows/MacOSX, applications are usually installed on a directory of + # their own + set (DOC_INSTALL_DIR doc) +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}) +endif () + +set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts) +set(WRAPPER_INSTALL_DIR ${LIB_ARCH_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_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}" + -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}" +) + + ############################################################################## # Common libraries / utilities -include_directories (${CMAKE_CURRENT_SOURCE_DIR}) +include_directories ( + ${CMAKE_CURRENT_SOURCE_DIR} + ${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 wglapi.py glxapi.py cglapi.py glapi.py gltypes.py stdapi.py + DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py ) if (WIN32) set (os os_win32.cpp) - set (glws glws_wgl.cpp) -else (WIN32) + set (glws_os glws_wgl.cpp) +else () set (os os_posix.cpp) - set (glws glws_glx.cpp) -endif (WIN32) + if (APPLE) + set (glws_os glws_cocoa.mm) + else () + set (glws_os glws_glx.cpp) + endif () +endif () -add_library (common - trace_model.cpp - trace_parser.cpp - trace_writer.cpp - trace_model_writer.cpp - image.cpp - image_bmp.cpp - image_pnm.cpp - image_png.cpp - ${os} +add_library (common STATIC + common/trace_file.cpp + common/trace_file_zlib.cpp + common/trace_file_snappy.cpp + common/trace_model.cpp + common/trace_parser.cpp + common/trace_writer.cpp + common/trace_writer_local.cpp + common/trace_writer_model.cpp + common/trace_loader.cpp + common/trace_tools_trace.cpp + common/image.cpp + common/image_bmp.cpp + common/image_pnm.cpp + common/image_png.cpp + common/${os} ) -add_executable (tracedump tracedump.cpp) -target_link_libraries (tracedump common) -install (TARGETS tracedump RUNTIME DESTINATION bin) +set_target_properties (common PROPERTIES + # Ensure it can be statically linked in shared libraries + COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}" +) + +link_libraries (common) ############################################################################## # API tracers if (WIN32) + if (MINGW) + # Silence warnings about @nn suffix mismatch + set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--enable-stdcall-fixup") + endif (MINGW) + # ddraw.dll if (DirectX_D3D_INCLUDE_DIR) include_directories (SYSTEM ${DirectX_D3D_INCLUDE_DIR}) add_custom_command ( - OUTPUT ddraw.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d.py > ${CMAKE_CURRENT_BINARY_DIR}/ddraw.cpp - DEPENDS d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py + OUTPUT ddrawtrace.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ddrawtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/ddrawtrace.cpp + DEPENDS ddrawtrace.py trace.py specs/d3d.py specs/d3dtypes.py specs/d3dcaps.py specs/ddraw.py specs/winapi.py specs/stdapi.py ) - add_library (ddraw MODULE ddraw.def ddraw.cpp trace_writer.cpp os_win32.cpp) + add_library (ddraw MODULE specs/ddraw.def ddrawtrace.cpp) set_target_properties (ddraw PROPERTIES PREFIX "" RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - install (TARGETS ddraw LIBRARY DESTINATION wrappers) + install (TARGETS ddraw LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif (DirectX_D3D_INCLUDE_DIR) # d3d8.dll if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR) include_directories (SYSTEM ${DirectX_D3D8_INCLUDE_DIR} ${DirectX_D3DX9_INCLUDE_DIR}) add_custom_command ( - OUTPUT d3d8.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp - DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py + OUTPUT d3d8trace.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8trace.cpp + DEPENDS d3d8trace.py trace.py specs/d3d8.py specs/d3d8types.py specs/d3d8caps.py specs/winapi.py specs/stdapi.py ) - add_library (d3d8 MODULE d3d8.def d3d8.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp) + add_library (d3d8 MODULE specs/d3d8.def d3d8trace.cpp d3dshader.cpp) set_target_properties (d3d8 PROPERTIES PREFIX "" RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - install (TARGETS d3d8 LIBRARY DESTINATION wrappers) + install (TARGETS d3d8 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR) # d3d9.dll if (DirectX_D3DX9_INCLUDE_DIR) include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR}) add_custom_command ( - OUTPUT d3d9.cpp - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp - DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py + OUTPUT d3d9trace.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9trace.cpp + DEPENDS d3d9trace.py trace.py specs/d3d9.py specs/d3d9types.py specs/d3d9caps.py specs/winapi.py specs/stdapi.py ) - add_library (d3d9 MODULE d3d9.def d3d9.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp) + add_library (d3d9 MODULE specs/d3d9.def d3d9trace.cpp d3dshader.cpp) set_target_properties (d3d9 PROPERTIES PREFIX "" RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - install (TARGETS d3d9 LIBRARY DESTINATION wrappers) + install (TARGETS d3d9 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif (DirectX_D3DX9_INCLUDE_DIR) # d3d10.dll - #if (DirectX_D3D10_INCLUDE_DIR) - # include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR}) - # add_custom_command ( - # OUTPUT d3d10.cpp - # COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp - # DEPENDS d3d10misc.py winapi.py stdapi.py - # ) - # add_library (d3d10 MODULE d3d10.def d3d10.cpp trace_writer.cpp os_win32.cpp) - # set_target_properties (d3d10 PROPERTIES PREFIX "") - # install (TARGETS d3d10 LIBRARY DESTINATION wrappers) - #endif (DirectX_D3D10_INCLUDE_DIR) + if (DirectX_D3D10_INCLUDE_DIR) + include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR}) + add_custom_command ( + OUTPUT d3d10trace.cpp + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp + DEPENDS d3d10trace.py trace.py specs/d3d10misc.py specs/d3d10.py specs/dxgi.py specs/dxgitype.py specs/dxgiformat.py specs/winapi.py specs/stdapi.py + ) + add_library (d3d10 MODULE specs/d3d10.def d3d10trace.cpp) + set_target_properties (d3d10 + PROPERTIES PREFIX "" + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + ) + install (TARGETS d3d10 LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) + endif (DirectX_D3D10_INCLUDE_DIR) # opengl32.dll add_custom_command ( OUTPUT wgltrace.cpp COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp - DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glparams.py gltypes.py winapi.py stdapi.py + DEPENDS wgltrace.py gltrace.py trace.py specs/wglapi.py specs/wglenum.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/winapi.py specs/stdapi.py ) - add_library (wgltrace MODULE opengl32.def + add_library (wgltrace MODULE specs/opengl32.def wgltrace.cpp glcaps.cpp - trace_writer.cpp - os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) set_target_properties (wgltrace PROPERTIES @@ -259,24 +363,19 @@ if (WIN32) RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) - if (MINGW) - set_target_properties(wgltrace PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.def") - endif (MINGW) - install (TARGETS wgltrace LIBRARY DESTINATION wrappers) + install (TARGETS wgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) elseif (APPLE) # OpenGL framework add_custom_command ( OUTPUT cgltrace.cpp COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/cgltrace.cpp - DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py + DEPENDS cgltrace.py gltrace.py trace.py specs/cglapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) add_library (cgltrace SHARED cgltrace.cpp glcaps.cpp - trace_writer.cpp - os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) @@ -291,13 +390,13 @@ elseif (APPLE) target_link_libraries (cgltrace dl) - install (TARGETS cgltrace LIBRARY DESTINATION wrappers) + install (TARGETS cgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) else () # libGL.so add_custom_command ( OUTPUT glxtrace.cpp COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glxtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glxtrace.cpp - DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py + DEPENDS glxtrace.py gltrace.py trace.py specs/glxapi.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) add_library (glxtrace SHARED @@ -305,26 +404,21 @@ else () glxtrace.cpp glcaps.cpp glsnapshot.cpp - trace_writer.cpp - image.cpp - image_png.cpp - os_posix.cpp ) set_target_properties (glxtrace PROPERTIES # avoid the default "lib" prefix PREFIX "" - ) - - # Prevent symbol relocations internal to our wrapper library to be - # overwritten by the application. - set_target_properties (glxtrace PROPERTIES + # Prevent symbol relocations internal to our wrapper library to be + # overwritten by the application. LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions" + RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers + LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers ) target_link_libraries (glxtrace dl ${X11_X11_LIB}) - - install (TARGETS glxtrace LIBRARY DESTINATION lib) + + install (TARGETS glxtrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR}) endif () @@ -334,13 +428,13 @@ endif () 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 codegen.py glapi.py gltypes.py stdapi.py + 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.py > ${CMAKE_CURRENT_BINARY_DIR}/glstate_params.cpp - DEPENDS glstate.py glparams.py gltypes.py stdapi.py + DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) include_directories ( @@ -357,8 +451,9 @@ add_executable (glretrace glstate.cpp glstate_params.cpp retrace.cpp - ${glws} - image.cpp + retrace_stdc.cpp + glws.cpp + ${glws_os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) @@ -375,10 +470,8 @@ target_link_libraries (glretrace if (WIN32) target_link_libraries (glretrace ${OPENGL_gl_LIBRARY}) elseif (APPLE) - # XXX: We use GLX on MacOSX, which is in a separate library. target_link_libraries (glretrace - ${X11_GL_LIB} - ${X11_X11_LIB} + "-framework Cocoa" "-framework ApplicationServices" # CGS* ${OPENGL_gl_LIBRARY} # CGL* ) @@ -388,21 +481,33 @@ endif () install (TARGETS glretrace RUNTIME DESTINATION bin) +############################################################################## +# CLI + +add_subdirectory(cli) ############################################################################## # GUI -if (QT4_FOUND AND QJSON_FOUND) +if (ENABLE_GUI AND QT4_FOUND AND QJSON_FOUND) add_subdirectory(gui) -endif (QT4_FOUND AND QJSON_FOUND) +endif () ############################################################################## # Packaging -install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc) +install ( + FILES + BUGS.markdown + LICENSE + NEWS.markdown + README.markdown + TODO.markdown + DESTINATION ${DOC_INSTALL_DIR} +) -set (CPACK_PACKAGE_VERSION_MAJOR "1") +set (CPACK_PACKAGE_VERSION_MAJOR "2") set (CPACK_PACKAGE_VERSION_MINOR "0") # Use current date in YYYYMMDD format as patch number