[liggghts] 02/05: Build against VTK6 instead of VTK5.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository liggghts.

commit ce0d980b7552b454e4e13db2e0c8f16431abaf67
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Apr 23 22:06:28 2014 +0200

    Build against VTK6 instead of VTK5.
---
 debian/control                          |  4 ++++
 debian/patches/01_add_cmake_files.patch | 24 +++++++++++++++++-------
 debian/patches/05_vtk6_support.patch    | 15 +++++++++++++++
 debian/patches/series                   |  1 +
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index bbfaa5a..47201eb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,11 @@ Build-Depends:
  cmake,
  debhelper (>= 9),
  libboost-mpi-dev,
+ libeigen3-dev,
  libjpeg-dev,
+ libpython-dev,
+ libqt4-opengl-dev,
+ libvtk6-dev,
  mpi-default-bin,
  mpi-default-dev
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index be2e0f8..577bca6 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -4,7 +4,7 @@ Last-Update: 2014-03-04
 
 --- /dev/null
 +++ b/CMakeLists.txt
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,86 @@
 +# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
 +# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
 +# SUFFIX: add sufix to binary-name (NONE by default)
@@ -27,12 +27,18 @@ Last-Update: 2014-03-04
 +
 +INCLUDE(FindVTK)
 +INCLUDE(GNUInstallDirs)
-+FIND_PACKAGE(VTK COMPONENTS Common)
++INCLUDE(FindPythonLibs)
++FIND_PACKAGE(VTK)
 +IF(VTK_FOUND)
++  IF(${VTK_MAJOR_VERSION} EQUAL 6)
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK6 -DLAMMPS_VTK")
++    MESSAGE(STATUS "Found VTK6")
++  ELSE(${VTK_MAJOR_VERSION} EQUAL 6)
++    LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK")
++    MESSAGE(STATUS "Found VTK")
++  ENDIF(${VTK_MAJOR_VERSION} EQUAL 6)
 +  INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
-+  LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
-+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK")
-+  MESSAGE(STATUS "Found VTK")
 +  
 +  FIND_PACKAGE(Eigen3 REQUIRED)
 +  INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
@@ -87,7 +93,7 @@ Last-Update: 2014-03-04
 +ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1,84 +1,53 @@
+@@ -1,84 +1,57 @@
 -# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
 -# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
 -# SUFFIX: add sufix to binary-name (NONE by default)
@@ -170,7 +176,11 @@ Last-Update: 2014-03-04
  
 -#=======================================
 +IF(VTK_FOUND)
-+  TARGET_LINK_LIBRARIES(libliggghts vtkHybrid)
++  IF(${VTK_MAJOR_VERSION} EQUAL 6)
++    TARGET_LINK_LIBRARIES(libliggghts ${VTK_LIBRARIES})
++  ELSE(${VTK_MAJOR_VERSION} EQUAL 6)
++    TARGET_LINK_LIBRARIES(libliggghts vtkHybrid)
++  ENDIF(${VTK_MAJOR_VERSION} EQUAL 6)
 +ENDIF(VTK_FOUND)
 +
 +INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
new file mode 100644
index 0000000..a16249c
--- /dev/null
+++ b/debian/patches/05_vtk6_support.patch
@@ -0,0 +1,15 @@
+--- a/src/dump_atom_vtk.cpp
++++ b/src/dump_atom_vtk.cpp
+@@ -305,7 +305,11 @@
+ 
+   vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
+   writer->SetDataModeToAscii();
+-  writer->SetInput(spheresUg);
++  #ifdef LAMMPS_VTK6
++    writer->SetInputData(spheresUg);
++  #else
++    writer->SetInput(spheresUg);
++  #endif
+   writer->SetFileName(_fileName);
+   writer->Write();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f610a7f..897ada5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_add_cmake_files.patch
+05_vtk6_support.patch

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