[asl] 06/27: Merge branch 'master' into develop

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository asl.

commit d2a0e8ac2441f8e73e567f9e70b42a917e42c279
Merge: ceb8449 b500a03
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Nov 7 09:43:53 2016 +0200

    Merge branch 'master' into develop

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc CMakeLists.txt
index db86565,437aea7..db29a5a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -53,9 -53,9 +53,9 @@@ find_package(OpenCL 1.1 REQUIRED
  # ToDo: check - system component might be not needed any longer on new versions of Boost
  find_package(Boost 1.55 REQUIRED COMPONENTS program_options filesystem system)
  # ToDo: remove support for VTK 6.1 at some point in future
 -find_package(VTK 6.1 QUIET COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
 +find_package(VTK 6.1 QUIET COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOGeometry vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
  if(NOT VTK_FOUND)
- 	find_package(VTK 7.0 REQUIRED COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
+ 	find_package(VTK 7.0 REQUIRED COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOGeometry vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
  endif()
  include(${VTK_USE_FILE})
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git