[liggghts] 02/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Jan 16 23:59:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit 662e9770d61486a6a19a972f765e82dd4c31bef9
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jan 17 00:49:48 2016 +0100
Refresh patches.
---
debian/patches/01_add_cmake_files.patch | 197 +++++++++++++++++++-------------
debian/patches/05_vtk6_support.patch | 6 +-
2 files changed, 118 insertions(+), 85 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 18bbb0e..97a7eca 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/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.3.1/CMakeLists.txt
===================================================================
--- /dev/null
-+++ liggghts/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.3.1/CMakeLists.txt
@@ -0,0 +1,87 @@
+# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
+# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
@@ -20,7 +20,7 @@ Index: liggghts/CMakeLists.txt
+SET(CMAKE_VERBOSE_MAKEFILE 1)
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
-+SET(VERSION 3.1.0)
++SET(VERSION 3.3.1)
+#=======================================
+
+FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
@@ -94,49 +94,69 @@ Index: liggghts/CMakeLists.txt
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: liggghts/src/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.3.1/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)
--# SUFFIX: add sufix to binary-name (NONE by default)
--# USERPATH: use RPATH for search of the shared library libliggghts, need to be switched on by packaging (ON by default)
--# VERSION: version number (2.2 by default)
--# LIB_SUFFIX: suffix, where libliggghts library will be installed, lib/${LIB_SUFFIX} (NONE by default)
--
+--- LIGGGHTS-PUBLIC-3.3.1.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.3.1/src/CMakeLists.txt
+@@ -1,115 +1,57 @@
-PROJECT(LIGGGHTS C CXX)
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
--
--SET(CMAKE_VERBOSE_MAKEFILE 1)
--SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
--
--SET(VERSION 2.2)
--SET(USERPATH 1)
--#=======================================
--
--IF (NOT CMAKE_CXX_FLAGS)
-- #If flags are not set, add default flags
-- SET(CMAKE_BUILD_TYPE Release)
-- SET(CMAKE_CXX_FLAGS " -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security")
--ENDIF (NOT CMAKE_CXX_FLAGS)
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+FILE(GLOB SRC_FILES_SRC "*.cpp")
+SET(SRC_FILES ${SRC_FILES_SRC})
--#=======================================
+-SET(LIGGGHTS_MAJOR_VERSION 3)
+-SET(LIGGGHTS_MINOR_VERSION 2)
+-SET(LIGGGHTS_PATCH_VERSION 1)
+-SET(LIGGGHTS_VERSION ${LIGGGHTS_MAJOR_VERSION}.${LIGGGHTS_MINOR_VERSION}.${LIGGGHTS_PATCH_VERSION})
+-
+-IF (NOT CMAKE_CXX_FLAGS)
+- IF(CMAKE_COMPILER_IS_GNUCXX)
+- SET(CMAKE_CXX_FLAGS "-O2 -funroll-loops -fstrict-aliasing -Wall -Wno-uninitialized -std=c++11 -Wno-literal-suffix")
+- ENDIF()
+-ENDIF()
+-
+-FILE(GLOB SOURCES *.cpp)
+-#LIST(REMOVE_ITEM SOURCES main.cpp)
+-
+-IF(WIN32)
+- #include (GenerateExportHeader)
+- INCLUDE_DIRECTORIES(WINDOWS/extra)
+- ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
+-
+- IF(MSVC)
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+- ENDIF()
+-
+- FIND_PACKAGE(Cygwin REQUIRED)
+-
+- ADD_CUSTOM_TARGET(GenerateHeaders
+- COMMAND GenerateHeaders.bat ${CYGWIN_INSTALL_PATH}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WINDOWS)
+-ELSE()
+- ADD_CUSTOM_TARGET(GenerateHeaders
+- COMMAND sh Make.sh style
+- COMMAND sh Make.sh models
+- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+-ENDIF()
+-
+-#ADD_LIBRARY(liggghts STATIC ${SOURCES})
+-#ADD_LIBRARY(liggghts SHARED ${SOURCES})
+-#GENERATE_EXPORT_HEADER( liggghts
+-# BASE_NAME liggghts
+-# EXPORT_MACRO_NAME liggghts_EXPORT
+-# EXPORT_FILE_NAME liggghts_Export.h
+-# STATIC_DEFINE liggghts_BUILT_AS_STATIC
+-#)
+-#ADD_DEPENDENCIES(liggghts GenerateHeaders)
+-
+-#ADD_EXECUTABLE(liggghts_bin main.cpp)
+-ADD_EXECUTABLE(liggghts_bin ${SOURCES})
+-#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")
--INCLUDE(FindVTK)
--FIND_PACKAGE(VTK COMPONENTS Common)
--IF(VTK_FOUND)
-- INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
-- LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK")
-- MESSAGE(STATUS "Found VTK")
--ELSE(VTK_FOUND)
-- MESSAGE(STATUS "VTK NOT found!")
--ENDIF(VTK_FOUND)
+-#=======================================
+FOREACH(SUB_DIR_ADD ${MODULES_PACKAGE} ${MODULES_USER})
+ MESSAGE("SUB_DIR_ADD: ${SUB_DIR_ADD}")
+ FILE(GLOB SRC_FILES_ADD "${SUB_DIR_ADD}/*.cpp")
@@ -164,66 +184,79 @@ Index: liggghts/src/CMakeLists.txt
+ VERSION ${VERSION}
+ SOVERSION 3)
--#=======================================
--
--INCLUDE(FindJPEG)
- IF(JPEG_FOUND)
-- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_JPEG")
--ELSE(JPEG_FOUND)
-- MESSAGE(STATUS "JPEG NOT found!")
+-FIND_PACKAGE(VTK NO_MODULE)
++IF(JPEG_FOUND)
+ TARGET_LINK_LIBRARIES(libliggghts ${JPEG_LIBRARIES})
- ENDIF(JPEG_FOUND)
++ENDIF(JPEG_FOUND)
--#=======================================
-+IF(VTK_FOUND)
+ IF(VTK_FOUND)
+- INCLUDE(${VTK_USE_FILE})
+- ADD_DEFINITIONS(-DLAMMPS_VTK)
+-# TARGET_LINK_LIBRARIES(liggghts ${VTK_LIBRARIES})
+- TARGET_LINK_LIBRARIES(liggghts_bin ${VTK_LIBRARIES})
+- MESSAGE(STATUS "Found VTK")
+-ELSE(VTK_FOUND)
+- MESSAGE(STATUS "VTK NOT found!")
+ 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)
-+
+ ENDIF(VTK_FOUND)
+
+-#=======================================
+-
+-FIND_PACKAGE(JPEG)
+INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
+#======================================================
-+
+
+-IF(JPEG_FOUND)
+- INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
+- ADD_DEFINITIONS(-DLAMMPS_JPEG)
+- #TARGET_LINK_LIBRARIES(liggghts jpeg)
+- TARGET_LINK_LIBRARIES(liggghts_bin jpeg)
+-ELSE(JPEG_FOUND)
+- MESSAGE(STATUS "JPEG NOT found!")
+-ENDIF(JPEG_FOUND)
+ADD_EXECUTABLE(liggghts main.cpp)
+SET_TARGET_PROPERTIES(liggghts PROPERTIES OUTPUT_NAME "liggghts${SUFFIX}")
+TARGET_LINK_LIBRARIES(liggghts libliggghts)
--INCLUDE(FindMPI)
--IF(MPI_C_FOUND AND MPI_CXX_FOUND)
-- SET(CMAKE_C_COMPILER ${MPI_C_COMPILER})
-- SET(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
--ELSE(MPI_C_FOUND AND MPI_CXX_FOUND)
-- #Check old FindMPI version
-- IF(MPI_COMPILER)
-- SET(CMAKE_C_COMPILER ${MPI_COMPILER})
-- SET(CMAKE_CXX_COMPILER ${MPI_COMPILER})
-- ELSE(MPI_COMPILER)
-- MESSAGE(FATAL_ERROR "MPI-COMPILER NOT found!")
-- ENDIF(MPI_COMPILER)
--ENDIF(MPI_C_FOUND AND MPI_CXX_FOUND)
--
--#=======================================
--
--#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)
-#=======================================
+INSTALL(TARGETS liggghts DESTINATION "${CMAKE_INSTALL_BINDIR}/")
--INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
--INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+-FIND_PACKAGE(MPI)
+#======================================================
--ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
+-IF(MPI_FOUND)
+- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+-# TARGET_LINK_LIBRARIES(liggghts ${MPI_LIBRARIES})
+- TARGET_LINK_LIBRARIES(liggghts_bin ${MPI_LIBRARIES})
+-
+- IF(MPI_COMPILE_FLAGS)
+-# SET_TARGET_PROPERTIES(liggghts PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+- SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+- ENDIF()
+-
+- IF(MPI_LINK_FLAGS)
+-# SET_TARGET_PROPERTIES(liggghts PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+- SET_TARGET_PROPERTIES(liggghts_bin PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+- ENDIF()
+-ELSE(MPI_FOUND)
+- MESSAGE(STATUS "MPI NOT found! Using MPI Stubs instead.")
+- ADD_SUBDIRECTORY(STUBS)
+-# TARGET_LINK_LIBRARIES(liggghts mpi_stubs)
+- TARGET_LINK_LIBRARIES(liggghts_bin mpi_stubs)
+-ENDIF(MPI_FOUND)
+-
+-#=======================================
+-
+-#install(TARGETS liggghts liggghts_bin
+-# RUNTIME DESTINATION bin
+-# LIBRARY DESTINATION lib)
+-
+-install(TARGETS liggghts_bin
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib)
+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
index c013052..b1f6e63 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/src/dump_atom_vtk.cpp
+Index: LIGGGHTS-PUBLIC-3.3.1/src/dump_atom_vtk.cpp
===================================================================
---- liggghts.orig/src/dump_atom_vtk.cpp
-+++ liggghts/src/dump_atom_vtk.cpp
+--- LIGGGHTS-PUBLIC-3.3.1.orig/src/dump_atom_vtk.cpp
++++ LIGGGHTS-PUBLIC-3.3.1/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