[SCM] Paraview packaging branch, master, updated. debian/3.14.1-5-2-gd986588

Anton Gladky gladky.anton at gmail.com
Tue Jun 19 19:15:30 UTC 2012


The following commit has been merged in the master branch:
commit 61830213cb4909a56c560c0d3e388d778bc92c53
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jun 19 21:04:12 2012 +0200

    Install ParaViewUse.cmake.

diff --git a/debian/patches/install_all_cmake_files.patch b/debian/patches/install_all_cmake_files.patch
index f406335..66121e2 100644
--- a/debian/patches/install_all_cmake_files.patch
+++ b/debian/patches/install_all_cmake_files.patch
@@ -11,7 +11,7 @@ Last-Update: 2012-06-15
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -395,48 +395,11 @@
+@@ -395,50 +395,16 @@
        DESTINATION ${PV_INSTALL_INCLUDE_DIR}
        COMPONENT Development)
  
@@ -58,9 +58,16 @@ Last-Update: 2012-06-15
 +  # install all cmake files.
    INSTALL(
 -      FILES ${cmakeDevFiles} 
+-      DESTINATION ${PV_INSTALL_CMAKE_DIR}
+-      COMPONENT Development)
 +      # the extra "/" is essential to ensure we don't end up with an extra
 +      # directory at the install location.
 +      DIRECTORY "${ParaView_CMAKE_DIR}/" 
-       DESTINATION ${PV_INSTALL_CMAKE_DIR}
-       COMPONENT Development)
++      DESTINATION ${PV_INSTALL_CMAKE_DIR})
++  
++  INSTALL( FILES ${ParaView_SOURCE_DIR}/ParaViewUse.cmake 
++    DESTINATION ${PV_INSTALL_CMAKE_DIR}
++  )
        
+   # Re-configure for the install.
+   SET(SOURCE_TREE                                  ${ParaView_SOURCE_DIR})

-- 
Paraview packaging



More information about the debian-science-commits mailing list