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)
# Put all executables into the same top level build directory, regardless of
# which subdirectory they are declared
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_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)
##############################################################################
# Common libraries / utilities
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
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
install (TARGETS wgltrace LIBRARY DESTINATION wrappers)
elseif (APPLE)
- include_directories (${X11_INCLUDE_DIR})
-
# OpenGL framework
add_custom_command (
OUTPUT cgltrace.cpp
add_library (cgltrace SHARED cgltrace.cpp trace_writer.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
set_target_properties (cgltrace PROPERTIES
- # For
+ # 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"
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")
elseif (APPLE)
set (CPACK_GENERATOR "DragNDrop")
else ()
- set (CPACK_GENERATOR "TGZ")
+ set (CPACK_GENERATOR "TBZ2")
endif ()
include(CPack)
projects / apitrace / blobdiff