[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. debian/1.5.3-1-8-g9ec1537
Anton Gladky
gladky.anton at gmail.com
Tue May 7 20:58:32 UTC 2013
The following commit has been merged in the master branch:
commit 8fe04ee0367194f449b7f3375d4528cc82643c06
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Tue May 7 22:46:23 2013 +0200
Use cmake for building.
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
new file mode 100644
index 0000000..81c735e
--- /dev/null
+++ b/debian/patches/01_add_cmake_files.patch
@@ -0,0 +1,216 @@
+Description: adds cmake files. Will hopefully be accepted by upstream.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-07
+
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,87 @@
++# 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)
++# VERSION: version number (2.2 by default)
++# LIB_SUFFIX: suffix, where libliggghts library will be installed, lib/${LIB_SUFFIX} (NONE by default)
++
++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.3.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)
++
++#=======================================
++FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
++INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
++#=======================================
++
++INCLUDE(FindVTK)
++INCLUDE(GNUInstallDirs)
++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")
++
++ FIND_PACKAGE(Eigen3 REQUIRED)
++ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
++ MESSAGE(STATUS "Found Eigen3")
++ELSE(VTK_FOUND)
++ MESSAGE(STATUS "VTK NOT found!")
++ENDIF(VTK_FOUND)
++
++#=======================================
++
++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!")
++ENDIF(JPEG_FOUND)
++
++#=======================================
++
++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)
++#=======================================
++
++INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
++
++ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,84 +1,45 @@
+-# 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)
+-
+-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)
++FILE(GLOB SRC_FILES_SRC "*.cpp")
++SET(SRC_FILES ${SRC_FILES_SRC})
+
+-#=======================================
++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})
++
++
++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 2)
++
++IF(JPEG_FOUND)
++ TARGET_LINK_LIBRARIES(libliggghts ${JPEG_LIBRARIES})
++ENDIF(JPEG_FOUND)
+
+-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")
+-
+- FIND_PACKAGE(Eigen3 REQUIRED)
+- INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
+- MESSAGE(STATUS "Found Eigen3")
+-ELSE(VTK_FOUND)
+- MESSAGE(STATUS "VTK NOT found!")
++ TARGET_LINK_LIBRARIES(libliggghts vtkHybrid)
+ ENDIF(VTK_FOUND)
+
+-#=======================================
++INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
++#======================================================
+
+-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!")
+-ENDIF(JPEG_FOUND)
++ADD_EXECUTABLE(liggghts main.cpp)
++SET_TARGET_PROPERTIES(liggghts PROPERTIES OUTPUT_NAME "liggghts${SUFFIX}")
++TARGET_LINK_LIBRARIES(liggghts libliggghts)
+
+-#=======================================
++INSTALL(TARGETS liggghts DESTINATION "${CMAKE_INSTALL_BINDIR}/")
+
+-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)
+-#=======================================
++#======================================================
+
+-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
++INSTALL(FILES ${SRC_FILES_HEAD} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/liggghts${SUFFIX}/")
++#======================================================
+
+-ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
diff --git a/debian/patches/series b/debian/patches/series
index 4106eab..f610a7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-add_interpretator_name_to_the_examples.patches
-enable_default_compile_flags.patch
-fix_format_not_a_string.patch
-enable_jpeg.patch
-fix_gcc4.7_ftbfs.patch
+01_add_cmake_files.patch
--
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.
More information about the debian-science-commits
mailing list