[asl] 11/177: Updating dependencies

[Ghislain Vaillant]

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

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

commit 97345c9b19e2e94439080c0e161034a12451433a
Author: Zeev <zeev at debtop>
Date:   Tue Jun 9 21:49:45 2015 +0300

    Updating dependencies
---
 CMakeLists.txt                      | 9 +++++----
 DefineOptions.cmake                 | 2 +-
 src/readers/aslVTKFormatReaders.cxx | 6 +++---
 src/writers/aslVTKFormatWriters.cxx | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b93e28..d5cb119 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(asl)
 
 # After switching to 3.1 - remove FindOpenCL.cmake from the distribution
 # since it is supported by the cmake itself.
-cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 # Set version number
 set(ASL_VERSION_MAJOR 0)
@@ -26,10 +26,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 # Find dependencies
 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.49 REQUIRED COMPONENTS program_options filesystem system)
-find_package(VTK 5.8 REQUIRED)
+find_package(Boost 1.55 REQUIRED COMPONENTS program_options filesystem system)
+find_package(VTK 6.1 COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
+include(${VTK_USE_FILE})
 
-include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS})
+include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 set(CMAKE_CXX_FLAGS "-Wall -O3 -std=c++11")
 
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 15cb4d3..8ae9a8f 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -1,5 +1,5 @@
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-option(WITH_MATIO "Build with MATIO (Matlab) support" OFF)
+option(WITH_MATIO "Build with MATIO (Matlab) support" ON)
 option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF)
 option(WITH_TESTING "Build with unit tests" OFF)
 
diff --git a/src/readers/aslVTKFormatReaders.cxx b/src/readers/aslVTKFormatReaders.cxx
index b45ed7e..330dabe 100644
--- a/src/readers/aslVTKFormatReaders.cxx
+++ b/src/readers/aslVTKFormatReaders.cxx
@@ -137,7 +137,7 @@ namespace asl
 		modeller->SetOutputScalarTypeToFloat();
 		modeller->CappingOff();
 		modeller->SetCapValue(dx*3.6);
-		modeller->SetInput(surf);
+		modeller->SetInputData(surf);
 		modeller->ComputeModelBounds(surf);
 		modeller->SetMaximumDistance(dx*1.8*2.);
 		double b[6];
@@ -160,7 +160,7 @@ namespace asl
 		modeller->SetOutputScalarTypeToFloat();
 		modeller->CappingOff();
 		modeller->SetCapValue(b.dx*3.6);
-		modeller->SetInput(surf);
+		modeller->SetInputData(surf);
 		modeller->SetMaximumDistance(b.dx*1.8*2.);
 		double bound[6];
 		auto bp(b.getBPosition()); 
@@ -193,7 +193,7 @@ namespace asl
 		modeller->SetOutputScalarTypeToFloat();
 		modeller->CappingOff();
 		modeller->SetCapValue(dx*3.6);
-		modeller->SetInput(surf);
+		modeller->SetInputData(surf);
 		modeller->ComputeModelBounds(surf);
 		modeller->SetMaximumDistance(dx*1.8*2.);
 		double b[6];
diff --git a/src/writers/aslVTKFormatWriters.cxx b/src/writers/aslVTKFormatWriters.cxx
index 8474439..7b97e8b 100644
--- a/src/writers/aslVTKFormatWriters.cxx
+++ b/src/writers/aslVTKFormatWriters.cxx
@@ -113,7 +113,7 @@ namespace asl
 	void WriterVTKXML::write()
 	{
 		vtkSmartPointer<vtkXMLImageDataWriter> writer(vtkSmartPointer<vtkXMLImageDataWriter>::New());
-		writer->SetInput(makeVTKData(*block, scalarFields, vectorFields).GetPointer());
+		writer->SetInputData(makeVTKData(*block, scalarFields, vectorFields).GetPointer());
 		writer->SetFileName((file + "_" + numToStr(numOfWrites) + ".vti").c_str());
 		writer->SetDataModeToAppended();
 		writer->EncodeAppendedDataOff();		
@@ -136,7 +136,7 @@ namespace asl
 		for (unsigned int i(0); i < nComp; ++i)
 			names[i] += "-" + numToStr(i);
 		
-		writer->SetInput(castVTKData(data, names).GetPointer());
+		writer->SetInputData(castVTKData(data, names).GetPointer());
 		writer->SetFileName(fileName.c_str());
 		writer->SetDataModeToAppended();
 		writer->EncodeAppendedDataOff();		

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