[liggghts] 01/01: Add support for VTK6.2. (Closes: #793605)
Anton Gladky
gladk at moszumanska.debian.org
Wed Aug 5 13:48:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit 62739c0b156fe9e69a477ccc79219e89bf9cc6d2
Author: Anton Gladky <gladk at debian.org>
Date: Tue Aug 4 20:44:33 2015 +0200
Add support for VTK6.2. (Closes: #793605)
---
debian/patches/01_add_cmake_files.patch | 12 ++++++------
debian/patches/05_vtk6_support.patch | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index e7d157b..18bbb0e 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -2,10 +2,10 @@ Description: adds cmake files. Will hopefully be accepted by upstream.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-22
-Index: LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
+Index: liggghts/CMakeLists.txt
===================================================================
--- /dev/null
-+++ LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
++++ liggghts/CMakeLists.txt
@@ -0,0 +1,87 @@
+# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
+# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
@@ -29,7 +29,7 @@ Index: LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
+
+INCLUDE(GNUInstallDirs)
+INCLUDE(FindPythonLibs)
-+FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy)
++FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkIOParallelXML)
+INCLUDE(${VTK_USE_FILE})
+IF(VTK_FOUND)
+ IF(${VTK_MAJOR_VERSION} EQUAL 6)
@@ -94,10 +94,10 @@ Index: LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: LIGGGHTS-PUBLIC-3.2.0/src/CMakeLists.txt
+Index: liggghts/src/CMakeLists.txt
===================================================================
---- LIGGGHTS-PUBLIC-3.2.0.orig/src/CMakeLists.txt
-+++ LIGGGHTS-PUBLIC-3.2.0/src/CMakeLists.txt
+--- liggghts.orig/src/CMakeLists.txt
++++ liggghts/src/CMakeLists.txt
@@ -1,80 +1,57 @@
-# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
-# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
index 0595d6f..c013052 100644
--- a/debian/patches/05_vtk6_support.patch
+++ b/debian/patches/05_vtk6_support.patch
@@ -2,10 +2,10 @@ Description: Fixes compilation against VTK6
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-22
-Index: LIGGGHTS-PUBLIC-3.2.0/src/dump_atom_vtk.cpp
+Index: liggghts/src/dump_atom_vtk.cpp
===================================================================
---- LIGGGHTS-PUBLIC-3.2.0.orig/src/dump_atom_vtk.cpp
-+++ LIGGGHTS-PUBLIC-3.2.0/src/dump_atom_vtk.cpp
+--- liggghts.orig/src/dump_atom_vtk.cpp
++++ liggghts/src/dump_atom_vtk.cpp
@@ -320,11 +320,11 @@ void DumpATOMVTK::vtkExportData::writeSE
vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git
More information about the debian-science-commits
mailing list