Qt types stream operators, documentation updated, custom types support improved, bug fixes and new tests.

This commit is contained in:
Isaikin Roman
2015-09-12 16:48:21 +03:00
parent 4da435044d
commit 5761f66683
25 changed files with 1244 additions and 102 deletions

View File

@@ -39,8 +39,8 @@ else ()
set(PC_Requires "QtCore")
endif ()
option (QTGUI_TYPES "Build with support for QtGui types")
if (QTGUI_TYPES)
option (WITH_GUI_TYPES "Build with support for QtGui types")
if (WITH_GUI_TYPES)
if (QT4_BUILD)
find_package(Qt4 QTGUI)
else ()
@@ -48,12 +48,17 @@ if (QTGUI_TYPES)
endif ()
endif ()
if (Qt5Gui_FOUND)
message("Qt5Gui found")
include_directories(${Qt5Gui_INCLUDE_DIRS})
add_definitions(${Qt5Gui_DEFINITIONS})
option (WITH_LOCATION_TYPES "Build with support for QtLocation types")
if (WITH_LOCATION_TYPES)
find_package(Qt5Location QUIET)
endif ()
if (Qt5Location_FOUND)
message("Qt5Location found")
include_directories(${Qt5Location_INCLUDE_DIRS})
add_definitions(${Qt5Location_DEFINITIONS})
else ()
message("Qt5Gui not found")
message("Qt5Location not found")
endif ()
if (NOT WIN32)
@@ -80,10 +85,10 @@ set(MSGPACK_QT_LIB_VERSION_STRING "${QMSGPACK_MAJOR}.${QMSGPACK_MINOR}.${QMSGPAC
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
add_subdirectory(src)
#if (MSGPACK_BUILD_TESTS)
if (BUILD_TESTS)
enable_testing()
add_subdirectory(tests)
#endif ()
endif ()
install(EXPORT qmsgpack-export DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE MsgPackQtTargets.cmake)