set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-set (CMAKE_USE_PYTHON_VERSION 2.6)
+set (CMAKE_USE_PYTHON_VERSION 2.7 2.6)
find_package (PythonInterp REQUIRED)
find_package (OpenGL REQUIRED)
find_package (QJSON)
if (NOT WIN32)
- # Always use the bundled zlib and libpng sources on Windows to make it easy
- # to deploy the wrappers DLLs
- find_package (ZLIB)
- find_package (PNG)
find_package (X11 REQUIRED)
-else (NOT WIN32)
- find_package (DirectX)
+ # 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})
+ endif ()
+
+ include_directories (${X11_INCLUDE_DIR})
endif (NOT WIN32)
+if (WIN32)
+ find_package (DirectX)
+endif (WIN32)
+
##############################################################################
# Set global build options
if (MSVC)
# C99 includes for msvc
- include_directories (msvc)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msvc)
# Enable math constants defines
add_definitions (-D_USE_MATH_DEFINES)
# which subdirectory they are declared
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-
##############################################################################
# Bundled dependencies
+#
+# We always use the bundled zlib and libpng 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
-# Use bundled ZLIB if system one can't be found
-if (ZLIB_FOUND)
- include_directories (${ZLIB_INCLUDE_DIRS})
- link_libraries (${ZLIB_LIBRARIES})
-else (ZLIB_FOUND)
- add_library (zlib STATIC
- zlib/adler32.c
- zlib/compress.c
- zlib/crc32.c
- zlib/gzio.c
- zlib/uncompr.c
- zlib/deflate.c
- zlib/trees.c
- zlib/zutil.c
- zlib/inflate.c
- zlib/infback.c
- zlib/inftrees.c
- zlib/inffast.c
- )
- include_directories (zlib)
- link_libraries (zlib)
-endif (ZLIB_FOUND)
-
-# Use bundled LIBPNG if system one can't be found
-if (PNG_FOUND)
- include_directories (${PNG_INCLUDE_DIR})
- add_definitions (${PNG_DEFINITIONS})
- link_libraries (${PNG_LIBRARIES})
-else (PNG_FOUND)
- add_library (png STATIC
- libpng/png.c
- libpng/pngerror.c
- libpng/pngget.c
- libpng/pngmem.c
- libpng/pngpread.c
- libpng/pngread.c
- libpng/pngrio.c
- libpng/pngrtran.c
- libpng/pngrutil.c
- libpng/pngset.c
- libpng/pngtrans.c
- libpng/pngwio.c
- libpng/pngwrite.c
- libpng/pngwtran.c
- libpng/pngwutil.c
- )
- include_directories (libpng)
- link_libraries (png)
-endif (PNG_FOUND)
+set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+set (ZLIB_LIBRARIES z_bundled)
+add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
+
+include_directories (${ZLIB_INCLUDE_DIRS})
+link_libraries (${ZLIB_LIBRARIES})
+
+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})
+link_libraries (${PNG_LIBRARIES})
+
+# For glext headers
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
##############################################################################
set (glws glws_glx.cpp)
endif (WIN32)
-add_library (trace trace_model.cpp trace_parser.cpp trace_writer.cpp ${os})
+add_library (trace trace_model.cpp trace_parser.cpp trace_writer.cpp trace_model_writer.cpp ${os})
add_executable (tracedump tracedump.cpp)
target_link_libraries (tracedump trace)
if (WIN32)
# ddraw.dll
if (DirectX_D3D_INCLUDE_DIR)
- include_directories (${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
)
- add_library (ddraw SHARED ddraw.def ddraw.cpp trace_writer.cpp os_win32.cpp)
+ add_library (ddraw MODULE ddraw.def ddraw.cpp trace_writer.cpp os_win32.cpp)
set_target_properties (ddraw
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS ddraw RUNTIME DESTINATION wrappers)
+ install (TARGETS ddraw LIBRARY DESTINATION wrappers)
endif (DirectX_D3D_INCLUDE_DIR)
# d3d8.dll
if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
- include_directories (${DirectX_D3D8_INCLUDE_DIR} ${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
)
- add_library (d3d8 SHARED d3d8.def d3d8.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
+ add_library (d3d8 MODULE d3d8.def d3d8.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
set_target_properties (d3d8
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS d3d8 RUNTIME DESTINATION wrappers)
+ install (TARGETS d3d8 LIBRARY DESTINATION wrappers)
endif (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
# d3d9.dll
if (DirectX_D3DX9_INCLUDE_DIR)
- include_directories (${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
)
- add_library (d3d9 SHARED d3d9.def d3d9.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
+ add_library (d3d9 MODULE d3d9.def d3d9.cpp d3dshader.cpp trace_writer.cpp os_win32.cpp)
set_target_properties (d3d9
PROPERTIES PREFIX ""
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- install (TARGETS d3d9 RUNTIME DESTINATION wrappers)
+ install (TARGETS d3d9 LIBRARY DESTINATION wrappers)
endif (DirectX_D3DX9_INCLUDE_DIR)
# d3d10.dll
#if (DirectX_D3D10_INCLUDE_DIR)
- # include_directories (${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 SHARED d3d10.def d3d10.cpp trace_writer.cpp os_win32.cpp)
+ # add_library (d3d10 MODULE d3d10.def d3d10.cpp trace_writer.cpp os_win32.cpp)
# set_target_properties (d3d10 PROPERTIES PREFIX "")
- # install (TARGETS d3d10 RUNTIME DESTINATION wrappers)
+ # install (TARGETS d3d10 LIBRARY DESTINATION wrappers)
#endif (DirectX_D3D10_INCLUDE_DIR)
# opengl32.dll
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
)
- add_library (wgltrace SHARED opengl32.def wgltrace.cpp trace_writer.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+ add_library (wgltrace MODULE opengl32.def wgltrace.cpp trace_writer.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (wgltrace PROPERTIES
PREFIX ""
OUTPUT_NAME opengl32
if (MINGW)
set_target_properties(wgltrace PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup ${CMAKE_CURRENT_SOURCE_DIR}/opengl32.def")
endif (MINGW)
- install (TARGETS wgltrace RUNTIME DESTINATION wrappers)
+ install (TARGETS wgltrace LIBRARY DESTINATION wrappers)
elseif (APPLE)
- include_directories (${X11_INCLUDE_DIR})
-
- # libGL.dylib
+ # 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 glxapi.py glapi.py glparams.py gltypes.py stdapi.py
+ DEPENDS cgltrace.py gltrace.py trace.py cglapi.py glapi.py glparams.py gltypes.py stdapi.py
)
add_library (cgltrace SHARED cgltrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (cgltrace PROPERTIES
- # libGL.dylib
- OUTPUT_NAME GL
- # match the version
- LINK_FLAGS "-compatibility_version 1 -current_version 1.0.0"
+ # OpenGL framework name
+ PREFIX "" OUTPUT_NAME "OpenGL" SUFFIX ""
+ # Specificy the version and reexport GLU symbols
+ LINK_FLAGS "-compatibility_version 1 -current_version 1.0.0 -Wl,-reexport_library,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
target_link_libraries (cgltrace dl)
- # Symbolic link from system's libGL.dylib
- add_custom_command (
- TARGET cgltrace
- COMMAND ln -sf /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib ${PROJECT_BINARY_DIR}/wrappers/libGL.system.dylib
- )
-
- install (TARGETS cgltrace LIBRARY DESTINATION lib)
+ install (TARGETS cgltrace LIBRARY DESTINATION wrappers)
else ()
- include_directories (${X11_INCLUDE_DIR})
-
# libGL.so
add_custom_command (
OUTPUT glxtrace.cpp
DEPENDS glxtrace.py gltrace.py trace.py glxapi.py glapi.py glparams.py gltypes.py stdapi.py
)
- add_library (glxtrace SHARED glxtrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+ add_library (glxtrace SHARED
+ ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+ glxtrace.cpp
+ glsnapshot.cpp
+ trace_writer.cpp
+ image.cpp
+ os_posix.cpp
+ )
set_target_properties (glxtrace PROPERTIES
# avoid the default "lib" prefix
LINK_FLAGS "-Wl,-Bsymbolic -Wl,-Bsymbolic-functions"
)
- target_link_libraries (glxtrace dl)
+ target_link_libraries (glxtrace dl ${X11_X11_LIB})
install (TARGETS glxtrace LIBRARY DESTINATION lib)
endif ()
target_link_libraries (glretrace
trace
- ${OPENGL_gl_LIBRARY}
)
-if (NOT WIN32)
- target_link_libraries (glretrace ${X11_X11_LIB})
-
- # We use GLX on MacOSX, which is in a separate library
- if (APPLE)
- find_library (X11_GL_LIB GL ${X11_LIB_SEARCH_PATH})
- find_library (APPLICATIONSERVICES ApplicationServices)
- target_link_libraries (glretrace ${X11_GL_LIB} ${APPLICATIONSERVICES})
- endif (APPLE)
-endif (NOT WIN32)
+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 ApplicationServices" # CGS*
+ ${OPENGL_gl_LIBRARY} # CGL*
+ )
+else ()
+ target_link_libraries (glretrace ${OPENGL_gl_LIBRARY} ${X11_X11_LIB})
+endif ()
install (TARGETS glretrace RUNTIME DESTINATION bin)
##############################################################################
# Packaging
-install (FILES LICENSE README TODO DESTINATION doc)
+install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
set (CPACK_PACKAGE_VERSION_MAJOR "1")
set (CPACK_PACKAGE_VERSION_MINOR "0")
OUTPUT_VARIABLE CPACK_PACKAGE_VERSION_PATCH
)
+# See http://www.vtk.org/Wiki/CMake:CPackPackageGenerators
if (WIN32)
set (CPACK_GENERATOR "ZIP")
-else (WIN32)
- set (CPACK_GENERATOR "TGZ")
-endif (WIN32)
+elseif (APPLE)
+ set (CPACK_GENERATOR "DragNDrop")
+else ()
+ set (CPACK_GENERATOR "TBZ2")
+endif ()
include(CPack)
projects / apitrace / blobdiff