changeset 4345:7822fa96f9c8

fix travis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 05 Dec 2020 18:04:16 +0100
parents 25112063257b
children 1f08180cd86f
files .travis.yml COPYING OrthancFramework/COPYING README
diffstat 4 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml	Sat Dec 05 17:09:58 2020 +0100
+++ b/.travis.yml	Sat Dec 05 18:04:16 2020 +0100
@@ -45,7 +45,7 @@
     -DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog"
     -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_JSONCPP=OFF
     -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON
-    -DBOOST_LOCALE_BACKEND=icu
+    -DBOOST_LOCALE_BACKEND=icu -DUSE_SYSTEM_OPENSSL=OFF
     ../OrthancServer; fi
   - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
--- a/COPYING	Sat Dec 05 17:09:58 2020 +0100
+++ b/COPYING	Sat Dec 05 18:04:16 2020 +0100
@@ -672,3 +672,4 @@
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
--- a/OrthancFramework/COPYING	Sat Dec 05 17:09:58 2020 +0100
+++ b/OrthancFramework/COPYING	Sat Dec 05 18:04:16 2020 +0100
@@ -163,3 +163,4 @@
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
+
--- a/README	Sat Dec 05 17:09:58 2020 +0100
+++ b/README	Sat Dec 05 18:04:16 2020 +0100
@@ -45,6 +45,10 @@
 exception:
 http://people.gnome.org/~markmc/openssl-and-the-gpl.html
 
+Full information about the licensing of the Orthanc ecosystem is
+available in the Orthanc Book:
+https://book.orthanc-server.com/faq/licensing.html
+
 We also kindly ask scientific works and clinical studies that make
 use of Orthanc to cite Orthanc in their associated publications.
 Similarly, we ask open-source and closed-source products that make