Commit 5a36aace authored by Gert Wollny's avatar Gert Wollny
Browse files

New upstream version 0.8.7

parent 98aad394

CMake/DICOMConfig.cmake.in

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ set(DICOM_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@") 
set(DICOM_USE_ITK_GDCM "@USE_ITK_GDCM@")

set(DICOM_USE_GDCM "@USE_GDCM@")

set(DICOM_USE_DCMTK "@USE_DCMTK@")

set(DICOM_USE_SQLITE "@USE_SQLITE@")



# Auto-configured settings

set(DICOM_USE_VTKZLIB "@DICOM_USE_VTKZLIB@")

CMake/pkgIndex.tcl.in

+4 −15
Original line number Diff line number Diff line
@@ -5,20 +5,9 @@ package ifneeded @MODULE_TCL_NAME@ @VTK_VERSION_MAJOR@.@VTK_VERSION_MINOR@ { 
  }

  set libExt [info sharedlibextension]

  set libPath {@MODULE_TCL_PATH@}

  set configs "@CMAKE_CONFIGURATION_TYPES@"

  set dirs ${libPath}

  if { "${configs}" != "" } {

    # expect configuration subdirectories (Debug, Release, etc)

    foreach config ${configs} {

      set dirs [concat ${dirs} [file join ${libPath} ${config}] ]

    }

  }

  foreach dir ${dirs} {

    set libFile [file join ${dir} ${libPrefix}@LIB_TCL_OUTPUT_NAME@${libExt}]

  set libFile [file join ${libPath} ${libPrefix}@LIB_TCL_OUTPUT_NAME@${libExt}]

  if { [file exists ${libFile}] } {

    load ${libFile}

    package provide @MODULE_TCL_NAME@ @VTK_VERSION_MAJOR@.@VTK_VERSION_MINOR@

      break;

    }

  }

}

CMake/vtkDICOMConfig.h.in

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#cmakedefine DICOM_BUILD_TESTING

#cmakedefine DICOM_USE_GDCM

#cmakedefine DICOM_USE_DCMTK

#cmakedefine DICOM_USE_SQLITE

#cmakedefine DICOM_USE_VTKZLIB



/* Version number. */

CMake/vtkDICOMModule.h.in

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#ifndef vtkDICOMModule_h

#define vtkDICOMModule_h



#include <vtkABI.h>

#include "vtkABI.h"

#include "vtkDICOMConfig.h"



#if defined(DICOM_BUILD_SHARED_LIBS)

CMake/vtkWrapHierarchy.cmake

+4 −1
Original line number Diff line number Diff line
@@ -134,7 +134,10 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>: 
  # which aren't library dependencies, merely dependencies for generators and

  # such. The dependecies specified under "DEPENDS" in the vtk_module(..) macro

  # call are located under _LINK_DEPENDS.

  foreach(dep ${${module_name}_LINK_DEPENDS})

  if(NOT ${module_name}_WRAP_DEPENDS)

    set(${module_name}_WRAP_DEPENDS ${${module_name}_LINK_DEPENDS})

  endif()

  foreach(dep ${${module_name}_WRAP_DEPENDS})

    if(NOT "${module_name}" STREQUAL "${dep}")

      if(NOT ${dep}_EXCLUDE_FROM_WRAPPING)

        list(APPEND OTHER_HIERARCHY_FILES "${${dep}_WRAP_HIERARCHY_FILE}")