Commit a10e3689 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 0.8.9

parent 5a36aace

CMake/vtkDICOMBuild.h.in

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


  Program: DICOM for VTK



  Copyright (c) 2012-2013 David Gobbi

  Copyright (c) 2012-2019 David Gobbi

  All rights reserved.

  See Copyright.txt or http://www.cognitive-antics.net/bsd3.txt for details.

CMake/vtkDICOMConfig.h.in

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


  Program: DICOM for VTK



  Copyright (c) 2012-2013 David Gobbi

  Copyright (c) 2012-2019 David Gobbi

  All rights reserved.

  See Copyright.txt or http://www.cognitive-antics.net/bsd3.txt for details.

CMake/vtkWrapHierarchy.cmake

+3 −0
Original line number Diff line number Diff line
@@ -161,5 +161,8 @@ $<$<BOOL:$<TARGET_PROPERTY:${module_name},INCLUDE_DIRECTORIES>>: 
            ${INPUT_FILES}

    VERBATIM

    )

  add_custom_target(${module_name}Hierarchy

    DEPENDS

      ${OUTPUT_DIR}/${module_name}Hierarchy.stamp.txt)



endmacro()

CMakeLists.txt

+19 −14
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ project(DICOM) 
# CMake version requirements

cmake_minimum_required(VERSION 2.8.7)



# When CMake 3.0.0 is required, remove this block (see CMP0042).

if(NOT DEFINED CMAKE_MACOSX_RPATH)

  set(CMAKE_MACOSX_RPATH 0)

endif()



# Allow custom cmake overrides

set(DICOM_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake)

set(CMAKE_MODULE_PATH ${DICOM_CMAKE_DIR} ${CMAKE_MODULE_PATH})
@@ -19,7 +14,7 @@ include(CTest) 
# Project version

set(DICOM_MAJOR_VERSION 0)

set(DICOM_MINOR_VERSION 8)

set(DICOM_PATCH_VERSION 7)

set(DICOM_PATCH_VERSION 9)

set(DICOM_SHORT_VERSION "${DICOM_MAJOR_VERSION}.${DICOM_MINOR_VERSION}")

set(DICOM_VERSION "${DICOM_SHORT_VERSION}.${DICOM_PATCH_VERSION}")
@@ -52,6 +47,11 @@ if(Module_vtkDICOM) # We are being built as a VTK remote module 


else() # We are being built as a stand-alone package



  # When CMake 3.0.0 is required, remove this block (see CMP0042).

  if(NOT DEFINED CMAKE_MACOSX_RPATH)

    set(CMAKE_MACOSX_RPATH 0)

  endif()



  option(BUILD_SHARED_LIBS "Build shared libraries." OFF)



  # Which parts of the package to build
@@ -157,7 +157,11 @@ if(USE_DCMTK) 
  if(NOT DCMTK_FOUND)

    message(FATAL_ERROR "DCMTK not found or incomplete.")

  endif()

  if(${DCMTK_charls_LIBRARY})

    set(DCMTK_LIBS ${DCMTK_LIBRARIES} ${DCMTK_charls_LIBRARY})

  else()

    set(DCMTK_LIBS ${DCMTK_LIBRARIES})

  endif()

  if(APPLE)

    list(APPEND DCMTK_LIBS iconv)

  endif()
@@ -289,10 +293,14 @@ if(NOT Module_vtkDICOM) 
    find_package(Java REQUIRED)

    find_package(JNI REQUIRED)



    set(VTK_JAVA_SOURCE_VERSION "1.5" CACHE STRING "javac source version")

    set(VTK_JAVA_TARGET_VERSION "1.5" CACHE STRING "javac target version")

    if(NOT VTK_JAVA_SOURCE_VERSION)

      set(VTK_JAVA_SOURCE_VERSION "1.6" CACHE STRING "javac source version")

      mark_as_advanced(VTK_JAVA_SOURCE_VERSION)

    endif()

    if(NOT VTK_JAVA_TARGET_VERSION)

      set(VTK_JAVA_TARGET_VERSION "1.6" CACHE STRING "javac target version")

      mark_as_advanced(VTK_JAVA_TARGET_VERSION)

    endif()



    if(APPLE)

      set(JAVAC_OPTIONS -J-Xmx512m)
@@ -318,9 +326,6 @@ if(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400 OR MSVC10) 
  add_definitions(-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)

endif()



# For use by subdirectories

set(KWSYS_LIBS vtksys)



# The main library

add_subdirectory(Source)

Copyright.txt

+1 −1
Original line number Diff line number Diff line 
Copyright (c) 2012-2017 David Gobbi

Copyright (c) 2012-2019 David Gobbi

All rights reserved.



Redistribution and use in source and binary forms, with or without