Author: jodogne-guest Date: 2015-08-08 08:30:48 +0000 (Sat, 08 Aug 2015) New Revision: 19888
Modified: trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian trunk/packages/orthanc-dicomweb/trunk/debian/control trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake Log: Fix remaining issues Modified: trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian =================================================================== --- trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian 2015-08-08 07:59:25 UTC (rev 19887) +++ trunk/packages/orthanc-dicomweb/trunk/debian/README.Debian 2015-08-08 08:30:48 UTC (rev 19888) @@ -1,6 +1,7 @@ -Orthanc DICOMweb is a plugin to Orthanc, the lightweight, RESTful Vendor -Neutral Archive for medical imaging. It extends the Orthanc core with -support of the WADO and DICOMweb (QIDO-RS, STOW-RS, WADO-RS) standards. +Orthanc DICOMweb is a plugin to Orthanc, the lightweight, RESTful +Vendor Neutral Archive for medical imaging. It extends the Orthanc +core with support of the WADO (now known as WADO-URI) and DICOMweb +(QIDO-RS, STOW-RS, WADO-RS) standards. Homepage: http://www.orthanc-server.com/static.php?page=dicomweb Modified: trunk/packages/orthanc-dicomweb/trunk/debian/control =================================================================== --- trunk/packages/orthanc-dicomweb/trunk/debian/control 2015-08-08 07:59:25 UTC (rev 19887) +++ trunk/packages/orthanc-dicomweb/trunk/debian/control 2015-08-08 08:30:48 UTC (rev 19888) @@ -7,7 +7,7 @@ Standards-Version: 3.9.6 Build-Depends: cmake (>= 2.8), debhelper (>= 9), - libboost-all-dev | libboost1.58-all-dev, + libboost-all-dev, libgdcm2-dev, libgtest-dev (>= 1.6.0), libjpeg-dev, Modified: trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake =================================================================== --- trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake 2015-08-08 07:59:25 UTC (rev 19887) +++ trunk/packages/orthanc-dicomweb/trunk/debian/patches/cmake 2015-08-08 08:30:48 UTC (rev 19888) @@ -6,8 +6,23 @@ =================================================================== --- OrthancDicomWeb-0.1.orig/CMakeLists.txt +++ OrthancDicomWeb-0.1/CMakeLists.txt -@@ -147,9 +147,9 @@ message("Setting the version of the libr +@@ -48,7 +48,7 @@ include(CheckIncludeFileCXX) + include(CheckLibraryExists) + include(FindPythonInterp) + include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake) +-include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake) ++#include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake) + include(${ORTHANC_ROOT}/Resources/CMake/BoostConfiguration.cmake) + include(${ORTHANC_ROOT}/Resources/CMake/GoogleTestConfiguration.cmake) +@@ -141,15 +141,13 @@ add_library(OrthancDicomWeb SHARED ${COR + ${AUTOGENERATED_SOURCES} + ) + +-target_link_libraries(OrthancDicomWeb ${GDCM_LIBRARIES}) +- + message("Setting the version of the library to ${ORTHANC_DICOM_WEB_VERSION}") + add_definitions(-DORTHANC_DICOM_WEB_VERSION="${ORTHANC_DICOM_WEB_VERSION}") -set_target_properties(OrthancDicomWeb PROPERTIES @@ -15,7 +30,7 @@ - SOVERSION ${ORTHANC_DICOM_WEB_VERSION} +set_target_properties(OrthancDicomWeb PROPERTIES + NO_SONAME ON -+ LINK_FLAGS "-lgdcmDSED -lgdcmMSFF -luuid -Wl,-soname,libOrthancDicomWeb.so.${ORTHANC_DICOM_WEB_VERSION}" ++ LINK_FLAGS "-lgdcmDICT -lgdcmDSED -lgdcmMSFF -lgdcmCommon -luuid -Wl,-soname,libOrthancDicomWeb.so.${ORTHANC_DICOM_WEB_VERSION}" ) install( @@ -32,3 +47,21 @@ if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") +@@ -116,17 +116,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeB + endif() + + +-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") +- CHECK_INCLUDE_FILES(rpc.h HAVE_UUID_H) +-else() +- CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) +-endif() +- +-if (NOT HAVE_UUID_H) +- message(FATAL_ERROR "Please install the uuid-dev package") +-endif() +- +- + if (STATIC_BUILD) + add_definitions(-DORTHANC_STATIC=1) + else() _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit