From 7b80a9bd8e2877c42aa95a9f7d753b9f9a29108a Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 01 9月 2019 18:50:18 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/open-license-manager/open-license-manager.git
---
.travis.yml | 17 ++++++++++++-----
README.md | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2e4539c..88a8ea0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,14 @@
- valgrind
- libssl-dev
- zlib1g-dev
+ - libboost-dev
- libboost-test-dev
- libboost-filesystem-dev
- libboost-iostreams-dev
- libboost-program-options-dev
- libboost-system-dev
- libboost-thread-dev
+ - libboost-date-time-dev
- os: linux
dist: xenial
addons:
@@ -26,15 +28,20 @@
- valgrind
- libssl-dev
- zlib1g-dev
+ - libboost-dev
- libboost-test-dev
- libboost-filesystem-dev
- libboost-iostreams-dev
- libboost-program-options-dev
- libboost-system-dev
- libboost-thread-dev
-
+ - libboost-date-time-dev
+
before_script:
- - mkdir build
- - cd build && cmake ..
-script:
- - make
+ - mkdir build
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
+
+script:
+ - make
+ - make install
+ - make test
diff --git a/README.md b/README.md
index 88a5e13..e522a78 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
## prerequisites
GCC (Linux), MINGW or MSVC (Windows)
-cmake, boost, openssl (Linux/MINGW)
+cmake, boost, openssl (Linux/MINGW), you can find detailed instruction for each [supported environment](https://github.com/open-license-manager/open-license-manager/wiki/Build-the-library) in the wiki. Below an overview of the basic build procedure:
```
git clone https://github.com/open-license-manager/open-license-manager.git
--
Gitblit v1.9.1