[med-svn] r23711 - in trunk/packages/orthanc-webviewer/trunk/debian: . patches

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2017-03-17 15:57:34 +0000 (Fri, 17 Mar 2017)
New Revision: 23711

Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
Log:
Orthanc WebViewer 2.2

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-03-17 15:26:04 UTC (rev 23710)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-03-17 15:57:34 UTC (rev 23711)
@@ -1,3 +1,10 @@
+orthanc-webviewer (2.2-2) UNRELEASED; urgency=medium
+
+  [ Tiago Sturmer Daitx <tiago.daitx at canonical.com> ]
+  * Fix linking of libraries. Closes: #857355
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 17 Mar 2017 16:47:23 +0100
+
 orthanc-webviewer (2.2-1) unstable; urgency=medium
 
   * New upstream version.

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2017-03-17 15:26:04 UTC (rev 23710)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2017-03-17 15:57:34 UTC (rev 23711)
@@ -15,14 +15,8 @@
  
  
  # Check that the Orthanc SDK headers are available or download them
-@@ -177,15 +177,14 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GDCM)
-   add_dependencies(OrthancWebViewer GDCM)
- endif()
+@@ -183,9 +183,10 @@ message("Setting the version of the libr
  
--target_link_libraries(OrthancWebViewer ${GDCM_LIBRARIES})
--
- message("Setting the version of the library to ${ORTHANC_WEBVIEWER_VERSION}")
- 
  add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}")
  
 -set_target_properties(OrthancWebViewer PROPERTIES 
@@ -30,7 +24,7 @@
 -  SOVERSION ${ORTHANC_WEBVIEWER_VERSION})
 +set_target_properties(OrthancWebViewer PROPERTIES
 +  NO_SONAME ON
-+  LINK_FLAGS "-lgdcmMSFF -luuid -Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}"
++  LINK_FLAGS "-Wl,-soname,libOrthancWebViewer.so.${ORTHANC_WEBVIEWER_VERSION}"
 +  )
  
  install(