r43982 - in /packages/mrmpi/trunk/debian/patches: addcmake.patch tweakcmake.patch
malat-guest at users.alioth.debian.org
malat-guest at users.alioth.debian.org
Wed Oct 26 19:00:05 UTC 2011
Author: malat-guest
Date: Wed Oct 26 19:00:05 2011
New Revision: 43982
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43982
Log:
split patch into two components
Modified:
packages/mrmpi/trunk/debian/patches/addcmake.patch
packages/mrmpi/trunk/debian/patches/tweakcmake.patch
Modified: packages/mrmpi/trunk/debian/patches/addcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/addcmake.patch?rev=43982&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/addcmake.patch (original)
+++ packages/mrmpi/trunk/debian/patches/addcmake.patch Wed Oct 26 19:00:05 2011
@@ -4,7 +4,7 @@
Index: mrmpi-1.0~20110620/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
++++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:55:56.000000000 +0200
@@ -0,0 +1,21 @@
+PROJECT (MAPREDUCE)
+
@@ -30,7 +30,7 @@
Index: mrmpi-1.0~20110620/examples/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-1.0~20110620/examples/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
++++ mrmpi-1.0~20110620/examples/CMakeLists.txt 2011-10-26 20:55:56.000000000 +0200
@@ -0,0 +1,10 @@
+SET (example_LIBS mrmpi)
+
@@ -45,11 +45,11 @@
Index: mrmpi-1.0~20110620/mpistubs/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-1.0~20110620/mpistubs/CMakeLists.txt 2011-10-26 20:51:21.000000000 +0200
++++ mrmpi-1.0~20110620/mpistubs/CMakeLists.txt 2011-10-26 20:56:20.000000000 +0200
@@ -0,0 +1,22 @@
+SET (mpistubs_SOURCES mpi.cpp)
+
-+ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
++VTK_ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
+TARGET_LINK_LIBRARIES (mpistubs vtksys)
+IF(VTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(mpistubs PROPERTIES ${VTK_LIBRARY_PROPERTIES})
@@ -57,10 +57,10 @@
+
+IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ INSTALL(TARGETS mpistubs
-+ EXPORT MyExport
-+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
-+ ARCHIVE DESTINATION lib COMPONENT Development)
++ EXPORT ${VTK_INSTALL_EXPORT_NAME}
++ RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
++ ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
+
+IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -72,7 +72,7 @@
Index: mrmpi-1.0~20110620/src/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ mrmpi-1.0~20110620/src/CMakeLists.txt 2011-10-26 20:51:35.000000000 +0200
++++ mrmpi-1.0~20110620/src/CMakeLists.txt 2011-10-26 20:55:56.000000000 +0200
@@ -0,0 +1,37 @@
+SET (mrmpi_SOURCES
+ mapreduce.cpp
@@ -83,7 +83,7 @@
+ memory.cpp
+ error.cpp)
+
-+ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
++VTK_ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
+TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS})
+IF(VTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(MapReduceMPI PROPERTIES ${VTK_LIBRARY_PROPERTIES})
@@ -92,9 +92,9 @@
+IF(NOT VTK_INSTALL_NO_LIBRARIES)
+ INSTALL(TARGETS MapReduceMPI
+ EXPORT ${VTK_INSTALL_EXPORT_NAME}
-+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
-+ ARCHIVE DESTINATION lib COMPONENT Development)
++ RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
++ ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
+
+IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -108,6 +108,6 @@
+ ${CMAKE_CURRENT_SOURCE_DIR}/mapreduce.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/memory.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mrmpi_config.h
-+ DESTINATION include/mrmpi
++ DESTINATION ${VTK_INSTALL_INCLUDE_DIR_CM24}/mrmpi
+ COMPONENT Development)
+ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
Modified: packages/mrmpi/trunk/debian/patches/tweakcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/tweakcmake.patch?rev=43982&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/tweakcmake.patch (original)
+++ packages/mrmpi/trunk/debian/patches/tweakcmake.patch Wed Oct 26 19:00:05 2011
@@ -1,7 +1,7 @@
Index: mrmpi-1.0~20110620/CMakeLists.txt
===================================================================
---- mrmpi-1.0~20110620.orig/CMakeLists.txt 2011-10-26 20:44:38.000000000 +0200
-+++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:44:48.000000000 +0200
+--- mrmpi-1.0~20110620.orig/CMakeLists.txt 2011-10-26 20:59:27.000000000 +0200
++++ mrmpi-1.0~20110620/CMakeLists.txt 2011-10-26 20:59:28.000000000 +0200
@@ -1,6 +1,7 @@
PROJECT (MAPREDUCE)
@@ -10,3 +10,28 @@
INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
ADD_DEFINITIONS("-DMPICH_IGNORE_CXX_SEEK")
IF (MPI_LIBRARY)
+Index: mrmpi-1.0~20110620/mpistubs/CMakeLists.txt
+===================================================================
+--- mrmpi-1.0~20110620.orig/mpistubs/CMakeLists.txt 2011-10-26 20:59:36.000000000 +0200
++++ mrmpi-1.0~20110620/mpistubs/CMakeLists.txt 2011-10-26 20:59:39.000000000 +0200
+@@ -1,6 +1,6 @@
+ SET (mpistubs_SOURCES mpi.cpp)
+
+-VTK_ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
++ADD_LIBRARY (mpistubs ${mpistubs_SOURCES})
+ TARGET_LINK_LIBRARIES (mpistubs vtksys)
+ IF(VTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(mpistubs PROPERTIES ${VTK_LIBRARY_PROPERTIES})
+Index: mrmpi-1.0~20110620/src/CMakeLists.txt
+===================================================================
+--- mrmpi-1.0~20110620.orig/src/CMakeLists.txt 2011-10-26 20:59:30.000000000 +0200
++++ mrmpi-1.0~20110620/src/CMakeLists.txt 2011-10-26 20:59:33.000000000 +0200
+@@ -7,7 +7,7 @@
+ memory.cpp
+ error.cpp)
+
+-VTK_ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
++ADD_LIBRARY (MapReduceMPI ${mrmpi_SOURCES})
+ TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS})
+ IF(VTK_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(MapReduceMPI PROPERTIES ${VTK_LIBRARY_PROPERTIES})
More information about the debian-science-commits
mailing list