10 Commits

Author SHA1 Message Date
00cb8227ba Enable c++11 support. 2018-12-02 00:28:58 +03:00
38749ce09c Merge with romixlab/qmsgpack:master 2016-07-05 18:48:12 +03:00
906bcf58eb Update README.md 2016-07-05 16:18:38 +03:00
b8ad656986 Update README.md 2016-07-02 15:39:18 +03:00
82c9406bbc Add qt5 location deps in .travis.yml 2016-06-29 14:59:22 +03:00
fa0c1dbda2 Remove cmake deps in .travis.yml 2016-06-29 14:49:56 +03:00
aa6051425d Update .travis.yml 2016-06-29 12:57:40 +03:00
625e0ed521 Update .travis.yml 2016-06-29 12:54:37 +03:00
ed87ad9117 Update README.md 2016-06-29 12:39:20 +03:00
eb1f9de331 Update README.md 2016-06-29 12:35:53 +03:00
3 changed files with 23 additions and 34 deletions

View File

@ -1,21 +1,21 @@
language: cpp
compiler: gcc
compiler:
- gcc
dist: trusty
sudo: required
env:
- QT4_BUILD=OFF
before_install:
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
- sudo add-apt-repository --yes ppa:kalakris/cmake
- sudo apt-get update -qq
- sudo apt-get install -qq cmake libqtcore4 qt4-qmake libqt5core5 qt5-qmake qt5-default qtchooser libmsgpack-dev
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
- sudo apt-get update -qq
install:
- sudo apt-get install -y --force-yes build-essential g++-4.8 -y
- sudo apt-get install -y --force-yes qtbase5-dev qtdeclarative5-dev libqt5gui5 qttools5-dev-tools qttools5-dev qtmultimedia5-dev libqt5location5 qtlocation5-dev libmsgpack-dev
script:
- mkdir build
- cd build
- if [ "$QT4_BUILD" == "OFF" ]; then cmake -DBUILD_TESTS=TRUE -DQT4_BUILD=FALSE ..; else cmake -DBUILD_TESTS=TRUE -DQT4_BUILD=TRUE ..; fi
- make
- export CTEST_OUTPUT_ON_FAILURE=1
- make test
- qmake -qt=qt5 qmsgpack.pro
- make

View File

@ -1,11 +1,13 @@
set(Qt5Core_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
set(Qt5Test_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Test")
set(Qt5_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
set(QT_QMAKE_EXECUTABLE "/opt/Qt5.6.0/5.6/gcc_64/bin/qmake")
#set(Qt5Core_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
#set(Qt5Test_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Test")
#set(Qt5_DIR "/opt/Qt5.6.0/5.6/gcc_64/lib/cmake/Qt5Core")
#set(QT_QMAKE_EXECUTABLE "/opt/Qt5.6.0/5.6/gcc_64/bin/qmake")
project(qmsgpack)
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 3.1.0)
set (CMAKE_CXX_STANDARD 11)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
@ -100,4 +102,4 @@ install(EXPORT qmsgpack-export DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE MsgPa
file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/$CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX})
add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

View File

@ -1,23 +1,10 @@
qmsgpack
========
[![Build status](https://travis-ci.org/buzzySmile/qmsgpack.svg?branch=master)](https://travis-ci.org/buzzySmile/qmsgpack)
[![Doc Status](https://readthedocs.org/projects/qmsgpack/badge/?version=latest)](http://qmsgpack.readthedocs.org)
MessagePack for Qt
<p align="center">
<a href="https://travis-ci.org/romixlab/qmsgpack">
<img src="https://travis-ci.org/romixlab/qmsgpack.svg?branch=master"
alt="Build Status">
</a>
<a href="http://qmsgpack.readthedocs.io/en/latest/">
<img src="https://readthedocs.org/projects/qmsgpack/badge/?version=latest"
alt="Doc Status">
</a>
</p>
Documentation
-------------
Complete documentation is available here: [qmsgpack.readthedocs.io](http://qmsgpack.readthedocs.io/en/latest/)
Installation
------------