r36895 - in /packages/fenics/dolfin/trunk/debian: changelog patches/library_location.patch patches/series

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

Author: johannr-guest
Date: Tue Sep 14 17:49:25 2010
New Revision: 36895

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36895
Log:
Add patch to fix problem with DOLFIN CMake config file.

Added:
    packages/fenics/dolfin/trunk/debian/patches/library_location.patch
Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/patches/series

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=36895&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Sep 14 17:49:25 2010
@@ -1,3 +1,10 @@
+dolfin (0.9.9-3) unstable; urgency=low
+
+  * Add patch from upstream to fix problem with the CMake config file
+    (dolfin-config.cmake) having the wrong path to the DOLFIN library.
+
+ -- Johannes Ring <johannr at simula.no>  Tue, 14 Sep 2010 18:45:39 +0200
+
 dolfin (0.9.9-2) unstable; urgency=low
 
   * debian/rules: Make CMake skip adding runtime paths.

Added: packages/fenics/dolfin/trunk/debian/patches/library_location.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/library_location.patch?rev=36895&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/library_location.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/library_location.patch Tue Sep 14 17:49:25 2010
@@ -1,0 +1,16 @@
+diff -Nru dolfin-0.9.9.orig/dolfin/CMakeLists.txt dolfin-0.9.9/dolfin/CMakeLists.txt
+--- dolfin-0.9.9.orig/dolfin/CMakeLists.txt	2010-09-02 02:49:57.000000000 +0200
++++ dolfin-0.9.9/dolfin/CMakeLists.txt	2010-09-14 19:13:26.000000000 +0200
+@@ -288,8 +288,10 @@
+ #------------------------------------------------------------------------------
+ # Generate CMake config file (dolfin-config.cmake)
+ 
+-# Get library location
+-get_target_property(DOLFIN_LIBRARY dolfin LOCATION)
++# Set library location
++get_target_property(DOLFIN_LIBRARY_LOCATION dolfin LOCATION)
++get_filename_component(DOLFIN_LIBRARY_FILENAME ${DOLFIN_LIBRARY_LOCATION} NAME)
++set(DOLFIN_LIBRARY "${CMAKE_INSTALL_PREFIX}/${DOLFIN_LIB_DIR}/${DOLFIN_LIBRARY_FILENAME}")
+ 
+ configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin-config.cmake.in ${CMAKE_BINARY_DIR}/dolfin/dolfin-config.cmake @ONLY)
+ install(FILES ${CMAKE_BINARY_DIR}/dolfin/dolfin-config.cmake

Modified: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=36895&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series (original)
+++ packages/fenics/dolfin/trunk/debian/patches/series Tue Sep 14 17:49:25 2010
@@ -1,3 +1,4 @@
 cmake_find_petsc_slepc.patch
 cmake_find_trilinos.patch
 install.patch
+library_location.patch