changeset 129:61050d813d74

build wsi
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Jan 2018 11:06:35 +0100
parents f2abbac22d5c
children a266cfb9930f
files Sphinx/source/plugins/postgresql.rst Sphinx/source/plugins/wsi.rst
diffstat 2 files changed, 33 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Sphinx/source/plugins/postgresql.rst	Wed Jan 03 15:32:44 2018 +0100
+++ b/Sphinx/source/plugins/postgresql.rst	Thu Jan 04 11:06:35 2018 +0100
@@ -58,7 +58,7 @@
 Orthanc <compiling>` have already been installed)::
 
   $ sudo apt-get install libpq-dev postgresql-server-dev-all
-  $ cmake .. -DCMAKE_BUILD_TYPE=Debug \
+  $ cmake .. -DCMAKE_BUILD_TYPE=Release \
              -DALLOW_DOWNLOADS=ON \
              -DUSE_SYSTEM_GOOGLE_TEST=OFF \
              -DUSE_SYSTEM_ORTHANC_SDK=OFF
--- a/Sphinx/source/plugins/wsi.rst	Wed Jan 03 15:32:44 2018 +0100
+++ b/Sphinx/source/plugins/wsi.rst	Thu Jan 04 11:06:35 2018 +0100
@@ -24,6 +24,9 @@
 Compilation
 -----------
 
+Static linking
+^^^^^^^^^^^^^^
+
 .. highlight:: text
 
 The procedure to compile the WSI framework is similar of that for the
@@ -35,6 +38,7 @@
   $ cd Applications/Build
   $ cmake .. -DSTATIC_BUILD=ON -DCMAKE_BUILD_TYPE=Release
   $ make
+
   # Secondly, compile the viewer plugin
   $ mkdir ../../ViewerPlugin/Build
   $ cd ../../ViewerPlugin/Build
@@ -47,10 +51,38 @@
 * ``Applications/Build/OrthancWSIDicomToTiff``, which contains the DICOM-to-TIFF converter.
 * ``ViewerPlugin/Build/OrthancWSI``, which is a shared library containing the viewer plugin for Orthanc.
 
+Microsoft Windows
+^^^^^^^^^^^^^^^^^
+  
 Note that pre-compiled binaries for Microsoft Windows `are available
 <http://www.orthanc-server.com/browse.php?path=/whole-slide-imaging>`__.
 
 
+Dynamic linking
+^^^^^^^^^^^^^^^
+
+.. highlight:: text
+               
+If static linking is not desired, here are build instructions for
+Ubuntu 16.04 (provided build dependencies for the :ref:`core of
+Orthanc <compiling>` have already been installed)::
+
+  $ sudo apt-get install libopenjpeg-dev
+
+  # Firstly, compile the command-line tools
+  $ mkdir Applications/Build
+  $ cd Applications/Build
+  $ cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_ORTHANC_SDK=OFF
+  $ make
+
+  # Secondly, compile the viewer plugin
+  $ mkdir ../../ViewerPlugin/Build
+  $ cd ../../ViewerPlugin/Build
+  $ cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_ORTHANC_SDK=OFF -DALLOW_DOWNLOADS=ON
+  $ make
+
+
+
 Usage of the plugin
 -------------------