r44840 - in /packages/openturns/trunk/debian/patches: cmake-tools.patch series

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

Author: barbier-guest
Date: Sat May 19 22:28:21 2012
New Revision: 44840

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44840
Log:
New patch: cmake-tools.patch

Scripts openturns-module and openturns-config are currently broken
when building with CMake.

Added:
    packages/openturns/trunk/debian/patches/cmake-tools.patch
Modified:
    packages/openturns/trunk/debian/patches/series

Added: packages/openturns/trunk/debian/patches/cmake-tools.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/cmake-tools.patch?rev=44840&op=file
==============================================================================
--- packages/openturns/trunk/debian/patches/cmake-tools.patch (added)
+++ packages/openturns/trunk/debian/patches/cmake-tools.patch Sat May 19 22:28:21 2012
@@ -1,0 +1,54 @@
+Description: Fix openturns-config and openturns-module when
+ built with CMake.
+Author: Denis Barbier <bouzim at gmail.com>
+Last-Update: 2012-05-19
+
+Index: openturns/lib/src/CMakeLists.txt
+===================================================================
+--- openturns.orig/lib/src/CMakeLists.txt
++++ openturns/lib/src/CMakeLists.txt
+@@ -35,6 +35,12 @@
+                  ${CMAKE_CURRENT_BINARY_DIR}/openturns-config-build
+                  @ONLY
+                )
++set (WGET wget)
++set (CURL curl)
++set (prefix "${CMAKE_INSTALL_PREFIX}")
++set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
++set (libdir "${INSTALL_PATH}/lib${LIB_SUFFIX}")
++set (PACKAGE "${CPACK_PACKAGE_NAME}")
+ configure_file ( ${CMAKE_CURRENT_SOURCE_DIR}/openturns-module-build.in
+                  ${CMAKE_CURRENT_BINARY_DIR}/openturns-module-build
+                  @ONLY
+Index: openturns/lib/src/openturns-config-build.cmake.in
+===================================================================
+--- openturns.orig/lib/src/openturns-config-build.cmake.in
++++ openturns/lib/src/openturns-config-build.cmake.in
+@@ -43,8 +43,8 @@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ bindir=@INSTALL_PATH@/bin
+ sbindir=@INSTALL_PATH@/bin
+-libdir=@OPENTURNS_INSTALL_PATH@/lib at LIB_SUFFIX@
+-libexecdir=@OPENTURNS_INSTALL_PATH@/lib at LIB_SUFFIX@
++libdir=@INSTALL_PATH@/lib at LIB_SUFFIX@
++libexecdir=@INSTALL_PATH@/lib at LIB_SUFFIX@
+ sysconfdir=@SYSCONFIG_PATH@
+ datarootdir=@DATA_PATH@/$package
+ mandir=@DATA_PATH@
+@@ -52,14 +52,14 @@
+ infodir=@DATA_PATH@
+ datadir=@DATA_PATH@
+ m4dir=@DATA_PATH@/m4
+-includedir=@OPENTURNS_INSTALL_PATH@/include
++includedir=@INCLUDE_PATH@
+ localstatedir=@DATA_PATH@
+ sharedstatedir=@DATA_PATH@
+ 
+ pkgincludedir=@INCLUDE_PATH@
+ pkglibdir=@LIBRARY_PATH@
+ pkgswigdir=$pkgincludedir/swig
+-wrapperdir=$pkglibdir/wrappers
++wrapperdir=@WRAPPER_PATH@
+ 
+ if test $installed = yes 
+ then

Modified: packages/openturns/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/openturns/trunk/debian/patches/series?rev=44840&op=diff
==============================================================================
--- packages/openturns/trunk/debian/patches/series (original)
+++ packages/openturns/trunk/debian/patches/series Sat May 19 22:28:21 2012
@@ -5,6 +5,7 @@
 #pth.diff
 ftbfs-4.7.patch
 cmake-configdir.patch
+cmake-tools.patch
 no-link-python.patch
 bigendian-randomgenerator.patch
 installcheck.patch