r46774 - /packages/elemental/elemental/trunk/debian/patches/install.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Mon Jun 30 15:50:05 2014
New Revision: 46774

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46774
Log:
update patch

Modified:
    packages/elemental/elemental/trunk/debian/patches/install.patch

Modified: packages/elemental/elemental/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/elemental/elemental/trunk/debian/patches/install.patch?rev=46774&op=diff
==============================================================================
--- packages/elemental/elemental/trunk/debian/patches/install.patch	(original)
+++ packages/elemental/elemental/trunk/debian/patches/install.patch	Mon Jun 30 15:50:05 2014
@@ -1,8 +1,8 @@
-Index: elemental-0.81/external/pmrrr/CMakeLists.txt
+Index: elemental-0.83/external/pmrrr/CMakeLists.txt
 ===================================================================
---- elemental-0.81.orig/external/pmrrr/CMakeLists.txt	2013-07-25 02:57:55.000000000 +0200
-+++ elemental-0.81/external/pmrrr/CMakeLists.txt	2013-09-23 11:41:10.871594543 +0200
-@@ -199,8 +199,9 @@
+--- elemental-0.83.orig/external/pmrrr/CMakeLists.txt
++++ elemental-0.83/external/pmrrr/CMakeLists.txt
+@@ -198,8 +198,9 @@ foreach(HEADER ${PMRRR_H})
    list(APPEND PREPARED_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${HEADER})
  
    get_filename_component(HEADER_PATH ${HEADER} PATH)
@@ -13,20 +13,12 @@
  endforeach()
  add_custom_target(prepare_pmrrr_headers DEPENDS ${PREPARED_HEADERS})
  add_dependencies(pmrrr prepare_pmrrr_headers)
-Index: elemental-0.81/CMakeLists.txt
+Index: elemental-0.83/CMakeLists.txt
 ===================================================================
---- elemental-0.81.orig/CMakeLists.txt	2013-07-25 02:59:59.000000000 +0200
-+++ elemental-0.81/CMakeLists.txt	2013-09-23 10:50:49.775721594 +0200
-@@ -12,6 +12,7 @@
- project(Elemental)
- set(Elemental_VERSION_MAJOR 0)
- set(Elemental_VERSION_MINOR 81)
-+set(Elemental_VERSION_PATCH 1)
- 
- ################################################################################
- # Common build options                                                         #
-@@ -450,7 +451,7 @@
- endforeach()
+--- elemental-0.83.orig/CMakeLists.txt
++++ elemental-0.83/CMakeLists.txt
+@@ -594,7 +594,7 @@ endforeach()
+ set(QT5_LIBSTRING "-L${Qt5_LIBDIR} -lQt5Widgets -lQt5Gui -lQt5Core")
  configure_file(${PROJECT_SOURCE_DIR}/cmake/elemvariables.cmake
                 ${PROJECT_BINARY_DIR}/conf/elemvariables @ONLY)
 -install(FILES ${PROJECT_BINARY_DIR}/conf/elemvariables DESTINATION conf)
@@ -34,7 +26,7 @@
  
  # Grab all of the .c, .cpp, .h, and .hpp Elemental files
  file(GLOB_RECURSE ELEM_CPP RELATIVE ${PROJECT_SOURCE_DIR} "src/*.c" "src/*.cpp")
-@@ -500,6 +501,14 @@
+@@ -631,6 +631,14 @@ if(HAVE_QT5)
  endif()
  if(HAVE_PMRRR)
    add_library(elemental ${LIBRARY_TYPE} ${ELEM_SRC})
@@ -49,7 +41,7 @@
    target_link_libraries(elemental pmrrr ${LINK_LIBS})
    if(MPI_CXX_LINK_FLAGS AND MPI_C_LINK_FLAGS)
      set(MPI_LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_C_LINK_FLAGS}")
-@@ -510,6 +519,11 @@
+@@ -641,6 +649,11 @@ if(HAVE_PMRRR)
    endif()
  else()
    add_library(elemental ${LIBRARY_TYPE} ${ELEM_SRC})
@@ -61,7 +53,7 @@
    target_link_libraries(elemental ${LINK_LIBS})
    if(MPI_CXX_LINK_FLAGS)
      set(MPI_LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
-@@ -527,6 +541,7 @@
+@@ -658,6 +671,7 @@ foreach(HEADER ${ELEM_HEADERS})
    list(APPEND PREPARED_HEADERS ${PROJECT_BINARY_DIR}/${HEADER})
  
    get_filename_component(HEADER_PATH ${HEADER} PATH)