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 glext headers. Needs to be before system includes as often system's GL
+# headers bundle and include glext.h and glxext.h
+include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glext)
# For EGL headers
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr)
# 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
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- target_link_libraries (cgltrace dl)
+ target_link_libraries (cgltrace
+ pthread
+ dl
+ )
install (TARGETS cgltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
elseif (X11_FOUND)
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- target_link_libraries (glxtrace dl ${X11_X11_LIB})
+ target_link_libraries (glxtrace
+ ${X11_X11_LIB}
+ pthread
+ dl
+ )
install (TARGETS glxtrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif ()
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
)
- target_link_libraries (egltrace dl)
+ target_link_libraries (egltrace
+ pthread
+ dl
+ )
install (TARGETS egltrace LIBRARY DESTINATION ${WRAPPER_INSTALL_DIR})
endif ()
pthread
dl
)
+
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ target_link_libraries (glretrace rt)
+ endif ()
+
endif ()
install (TARGETS glretrace RUNTIME DESTINATION bin)
dl
)
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ target_link_libraries (eglretrace rt)
+ endif ()
+
install (TARGETS eglretrace RUNTIME DESTINATION bin)
endif ()
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}
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")