forked from romixlab/qmsgpack
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
00cb8227ba | |||
38749ce09c | |||
906bcf58eb | |||
b8ad656986 | |||
82c9406bbc | |||
fa0c1dbda2 | |||
aa6051425d | |||
625e0ed521 | |||
ed87ad9117 | |||
eb1f9de331 |
24
.travis.yml
24
.travis.yml
@ -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
|
||||
|
@ -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")
|
||||
|
19
README.md
19
README.md
@ -1,23 +1,10 @@
|
||||
qmsgpack
|
||||
========
|
||||
[](https://travis-ci.org/buzzySmile/qmsgpack)
|
||||
[](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
|
||||
------------
|
||||
|
Reference in New Issue
Block a user