[liggghts] 02/04: Update patch.
Anton Gladky
gladk at moszumanska.debian.org
Thu Mar 6 19:43:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit f92bd70f0cc0647a7a7d2985b5f3392198e5b699
Author: Anton Gladky <gladk at debian.org>
Date: Tue Mar 4 22:23:42 2014 +0100
Update patch.
---
debian/patches/01_add_cmake_files.patch | 86 ++++++++++++++++++---------------
1 file changed, 48 insertions(+), 38 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 81c735e..3479008 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -1,13 +1,14 @@
Description: adds cmake files. Will hopefully be accepted by upstream.
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-05-07
+Last-Update: 2014-03-04
--- /dev/null
+++ b/CMakeLists.txt
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,88 @@
+# 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)
+
@@ -17,7 +18,7 @@ Last-Update: 2013-05-07
+SET(CMAKE_VERBOSE_MAKEFILE 1)
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
+
-+SET(VERSION 2.3.2)
++SET(VERSION 3.0.0)
+SET(USERPATH 1)
+#=======================================
+
@@ -28,7 +29,7 @@ Last-Update: 2013-05-07
+ENDIF (NOT CMAKE_CXX_FLAGS)
+
+#=======================================
-+FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
++FIND_PACKAGE(Boost COMPONENTS mpi serialization REQUIRED)
+INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+#=======================================
+
@@ -79,7 +80,7 @@ Last-Update: 2013-05-07
+#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)
++ 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
@@ -94,7 +95,7 @@ Last-Update: 2013-05-07
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -1,84 +1,45 @@
+@@ -1,84 +1,53 @@
-# 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)
@@ -122,7 +123,21 @@ Last-Update: 2013-05-07
-#=======================================
+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")
+-
+- FIND_PACKAGE(Eigen3 REQUIRED)
+- INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
+- MESSAGE(STATUS "Found Eigen3")
+-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")
@@ -131,6 +146,15 @@ Last-Update: 2013-05-07
+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})
+
@@ -139,46 +163,31 @@ Last-Update: 2013-05-07
+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)
++ SOVERSION 3)
-#=======================================
-+INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
-+#======================================================
-
+-
-INCLUDE(FindJPEG)
--IF(JPEG_FOUND)
+ 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)
++ TARGET_LINK_LIBRARIES(libliggghts ${JPEG_LIBRARIES})
+ ENDIF(JPEG_FOUND)
+
+-#=======================================
++IF(VTK_FOUND)
++ TARGET_LINK_LIBRARIES(libliggghts vtkHybrid)
++ENDIF(VTK_FOUND)
++
++INSTALL(TARGETS libliggghts DESTINATION "${CMAKE_INSTALL_LIBDIR}/")
++#======================================================
++
+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})
@@ -206,11 +215,12 @@ Last-Update: 2013-05-07
- 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)
-+INSTALL(FILES ${SRC_FILES_HEAD} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/liggghts${SUFFIX}/")
+#======================================================
-ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
++INSTALL(FILES ${SRC_FILES_HEAD} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/liggghts${SUFFIX}/")
++#======================================================
--
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