[liggghts] 04/06: Refresh patches, remove uneeded ones.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jul 17 22:20:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit d14defe88aee8f08a190e29924e56530b8f18b7f
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jul 17 23:52:15 2017 +0200
Refresh patches, remove uneeded ones.
---
debian/patches/01_add_cmake_files.patch | 131 +++++++++++----------
debian/patches/05_vtk6_support.patch | 25 ----
.../b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch | 16 ---
debian/patches/series | 2 -
4 files changed, 66 insertions(+), 108 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 5616a29..5e28230 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -1,12 +1,12 @@
-Description: adds cmake files. Will hopefully be accepted by upstream.
+Description: Add cmake files
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-06-22
+Last-Update: 2017-07-17
-Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.7.0/CMakeLists.txt
===================================================================
--- /dev/null
-+++ LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
-@@ -0,0 +1,87 @@
++++ LIGGGHTS-PUBLIC-3.7.0/CMakeLists.txt
+@@ -0,0 +1,79 @@
+# 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)
@@ -20,7 +20,11 @@ Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
+SET(CMAKE_VERBOSE_MAKEFILE 1)
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
-+SET(VERSION 3.3.1)
++SET(LIGGGHTS_MAJOR_VERSION 3)
++SET(LIGGGHTS_MINOR_VERSION 7)
++SET(LIGGGHTS_PATCH_VERSION 0)
++SET(VERSION ${LIGGGHTS_MAJOR_VERSION}.${LIGGGHTS_MINOR_VERSION}.${LIGGGHTS_PATCH_VERSION})
++
+#=======================================
+
+FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
@@ -29,7 +33,7 @@ Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
+
+INCLUDE(GNUInstallDirs)
+INCLUDE(FindPythonLibs)
-+FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkIOParallelXML)
++FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkIOParallelXML vtkIOMPIParallel)
+INCLUDE(${VTK_USE_FILE})
+IF(VTK_FOUND)
+ IF(${VTK_MAJOR_VERSION} EQUAL 6)
@@ -41,7 +45,7 @@ Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
+ MESSAGE(STATUS "Found VTK")
+ ENDIF(${VTK_MAJOR_VERSION} EQUAL 6)
+ INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
-+
++
+ FIND_PACKAGE(Eigen3 REQUIRED)
+ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
+ MESSAGE(STATUS "Found Eigen3")
@@ -78,35 +82,50 @@ Index: LIGGGHTS-PUBLIC-3.5.0/CMakeLists.txt
+
+#=======================================
+
-+#Disabled modules
-+#GPU KIM MEAM POEMS REAX SRD
-+IF(ENABLE_PACKAGE)
-+ SET(MODULES_PACKAGE ASPHERE CLASS2 COLLOID DIPOLE FLD GRANULAR KSPACE MANYBODY MC MOLECULE OPT PERI REPLICA SHOCK XTC)
-+ENDIF(ENABLE_PACKAGE)
-+#Disabled modules
-+#USER-MISC
-+IF(ENABLE_PACKAGEUSER)
-+ SET(MODULES_USER USER-ATC USER-AWPMD USER-CG-CMM USER-CUDA USER-EFF USER-EWALDN USER-OMP USER-REAXC USER-SPH)
-+ENDIF(ENABLE_PACKAGEUSER)
-+#=======================================
-+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.7.0/src/CMakeLists.txt
===================================================================
---- LIGGGHTS-PUBLIC-3.5.0.orig/src/CMakeLists.txt
-+++ LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
-@@ -1,115 +1,57 @@
+--- LIGGGHTS-PUBLIC-3.7.0.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.7.0/src/CMakeLists.txt
+@@ -1,123 +1,56 @@
-PROJECT(LIGGGHTS C CXX)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
++ADD_CUSTOM_TARGET(GenerateHeaders
++ COMMAND sh Make.sh style
++ COMMAND sh Make.sh models
++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
++
+FILE(GLOB SRC_FILES_SRC "*.cpp")
+SET(SRC_FILES ${SRC_FILES_SRC})
++
++FILE(GLOB SRC_FILES_HEAD "*.h")
++
++#======================================================
++IF (USERPATH)
++ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
++ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/")
++ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++ENDIF (USERPATH)
++#======================================================
++
++FILE(GLOB to_remove main.cpp)
++LIST(REMOVE_ITEM SRC_FILES ${to_remove})
++
++ADD_LIBRARY(libliggghts SHARED ${SRC_FILES})
++TARGET_LINK_LIBRARIES(libliggghts ${Boost_LIBRARIES})
++
++SET_TARGET_PROPERTIES(libliggghts PROPERTIES
++ OUTPUT_NAME "liggghts${SUFFIX}"
++ VERSION ${VERSION}
++ SOVERSION 3)
-SET(LIGGGHTS_MAJOR_VERSION 3)
--SET(LIGGGHTS_MINOR_VERSION 2)
--SET(LIGGGHTS_PATCH_VERSION 1)
+-SET(LIGGGHTS_MINOR_VERSION 7)
+-SET(LIGGGHTS_PATCH_VERSION 0)
-SET(LIGGGHTS_VERSION ${LIGGGHTS_MAJOR_VERSION}.${LIGGGHTS_MINOR_VERSION}.${LIGGGHTS_PATCH_VERSION})
-
-IF (NOT CMAKE_CXX_FLAGS)
@@ -132,6 +151,12 @@ Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
- ADD_CUSTOM_TARGET(GenerateHeaders
- COMMAND GenerateHeaders.bat ${CYGWIN_INSTALL_PATH}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WINDOWS)
+- # enable parallelization
+- foreach(flag_var
+- CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
+- CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+- set(${flag_var} "${${flag_var}} /MP4")
+- endforeach()
-ELSE()
- ADD_CUSTOM_TARGET(GenerateHeaders
- COMMAND sh Make.sh style
@@ -154,36 +179,9 @@ Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
-#TARGET_LINK_LIBRARIES(liggghts_bin liggghts)
-ADD_DEPENDENCIES(liggghts_bin GenerateHeaders)
-SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES OUTPUT_NAME liggghts)
-+FILE(GLOB SRC_FILES_HEAD "*.h")
-
+-
-#=======================================
-+FOREACH(SUB_DIR_ADD ${MODULES_PACKAGE} ${MODULES_USER})
-+ MESSAGE("SUB_DIR_ADD: ${SUB_DIR_ADD}")
-+ FILE(GLOB SRC_FILES_ADD "${SUB_DIR_ADD}/*.cpp")
-+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/${SUB_DIR_ADD})
-+ SET(SRC_FILES ${SRC_FILES} ${SRC_FILES_ADD})
-+ENDFOREACH(SUB_DIR_ADD ${MODULES_PACKAGE} ${MODULES_USER})
-+
-+
-+#======================================================
-+IF (USERPATH)
-+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/")
-+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+ENDIF (USERPATH)
-+#======================================================
-+
-+FILE(GLOB to_remove main.cpp)
-+LIST(REMOVE_ITEM SRC_FILES ${to_remove})
-+
-+ADD_LIBRARY(libliggghts SHARED ${SRC_FILES})
-+TARGET_LINK_LIBRARIES(libliggghts ${Boost_LIBRARIES})
-+SET_TARGET_PROPERTIES(libliggghts PROPERTIES
-+ OUTPUT_NAME "liggghts${SUFFIX}"
-+ VERSION ${VERSION}
-+ SOVERSION 3)
-
+-
-FIND_PACKAGE(VTK NO_MODULE)
+IF(JPEG_FOUND)
+ TARGET_LINK_LIBRARIES(libliggghts ${JPEG_LIBRARIES})
@@ -207,9 +205,7 @@ Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
-#=======================================
-
-FIND_PACKAGE(JPEG)
-+INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
-+#======================================================
-
+-
-IF(JPEG_FOUND)
- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
- ADD_DEFINITIONS(-DLAMMPS_JPEG)
@@ -218,15 +214,17 @@ Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
-ELSE(JPEG_FOUND)
- MESSAGE(STATUS "JPEG NOT found!")
-ENDIF(JPEG_FOUND)
++INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
++#======================================================
+
+-#=======================================
+ADD_EXECUTABLE(liggghts main.cpp)
++ADD_DEPENDENCIES(liggghts GenerateHeaders)
+SET_TARGET_PROPERTIES(liggghts PROPERTIES OUTPUT_NAME "liggghts${SUFFIX}")
+TARGET_LINK_LIBRARIES(liggghts libliggghts)
--#=======================================
-+INSTALL(TARGETS liggghts DESTINATION "${CMAKE_INSTALL_BINDIR}/")
-
-FIND_PACKAGE(MPI)
-+#======================================================
++INSTALL(TARGETS liggghts DESTINATION "${CMAKE_INSTALL_BINDIR}/")
-IF(MPI_FOUND)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
@@ -255,8 +253,11 @@ Index: LIGGGHTS-PUBLIC-3.5.0/src/CMakeLists.txt
-# RUNTIME DESTINATION bin
-# LIBRARY DESTINATION lib)
-
--install(TARGETS liggghts_bin
-- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib)
+-#install(TARGETS liggghts_bin
+-# RUNTIME DESTINATION bin
+-# LIBRARY DESTINATION lib)
++#======================================================
+
+-install(TARGETS liggghts_bin DESTINATION ${CMAKE_INSTALL_PREFIX})
+INSTALL(FILES ${SRC_FILES_HEAD} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/liggghts${SUFFIX}/")
+#======================================================
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
deleted file mode 100644
index 7d01cff..0000000
--- a/debian/patches/05_vtk6_support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fixes compilation against VTK6
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-06-22
-
-Index: LIGGGHTS-PUBLIC-3.5.0/src/dump_atom_vtk.cpp
-===================================================================
---- LIGGGHTS-PUBLIC-3.5.0.orig/src/dump_atom_vtk.cpp
-+++ LIGGGHTS-PUBLIC-3.5.0/src/dump_atom_vtk.cpp
-@@ -320,11 +320,11 @@ void DumpATOMVTK::vtkExportData::writeSE
-
- vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
- writer->SetDataModeToAscii();
--#if VTK_MAJOR_VERSION < 6
-- writer->SetInput(spheresUg);
--#else
-- writer->SetInputData(spheresUg);
--#endif
-+ #ifdef LAMMPS_VTK6
-+ writer->SetInputData(spheresUg);
-+ #else
-+ writer->SetInput(spheresUg);
-+ #endif
- writer->SetFileName(_fileName);
- writer->Write();
- }
diff --git a/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch b/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
deleted file mode 100644
index ae3efe3..0000000
--- a/debian/patches/b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127 Mon Sep 17 00:00:00 2001
-From: Christoph Kloss <christoph.kloss at dcs-computing.com>
-Date: Thu, 19 May 2016 13:27:49 +0200
-Subject: [PATCH] Update surface_mesh_feature_remove.h
-
----
- src/surface_mesh_feature_remove.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: LIGGGHTS-PUBLIC-3.5.0/src/surface_mesh_feature_remove.h
-===================================================================
---- LIGGGHTS-PUBLIC-3.5.0.orig/src/surface_mesh_feature_remove.h
-+++ LIGGGHTS-PUBLIC-3.5.0/src/surface_mesh_feature_remove.h
-@@ -1 +1 @@
--void handleExclusion(int *) {this->error->one(FLERR,"surface mesh feature remove not available in this version");}
-+void handleExclusion(int *) {if(MultiNodeMesh<NUM_NODES>::minFeatureLength() > 0. )this->error->one(FLERR,"surface mesh feature remove not available in this version");}
diff --git a/debian/patches/series b/debian/patches/series
index 0b9e2b5..f610a7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
01_add_cmake_files.patch
-05_vtk6_support.patch
-b7cc08a225cb25b5b5db3b2bd5e9728fc1f3a127.patch
--
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