[ismrmrd] 02/02: d/patches/*: cmake module now works with debian
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Apr 29 18:27:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository ismrmrd.
commit c735c6c12b33964f9ae7ff9ea82664a0bee048d7
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date: Tue Apr 29 19:26:06 2014 +0100
d/patches/*: cmake module now works with debian
---
.../004-add-debian-support-to-cmake-module.diff | 33 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 34 insertions(+)
diff --git a/debian/patches/004-add-debian-support-to-cmake-module.diff b/debian/patches/004-add-debian-support-to-cmake-module.diff
new file mode 100644
index 0000000..622184e
--- /dev/null
+++ b/debian/patches/004-add-debian-support-to-cmake-module.diff
@@ -0,0 +1,33 @@
+Description: support for Debian-specific install path for cmake module
+Origin: other
+Forwarded: no
+Author: Ghislain Vaillant <ghisvail at gmail.com>
+Last-Update: 2014-04-29
+--- a/cmake/FindIsmrmrd.cmake
++++ b/cmake/FindIsmrmrd.cmake
+@@ -7,13 +7,13 @@
+ # ISMRMRD_SCHEMA_DIR - where to find ismrmrd.xsd
+
+ FIND_PATH( ISMRMRD_INCLUDE_DIR ismrmrd.h
+-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES include ismrmrd ismrmrd/include)
++HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES include ismrmrd ismrmrd/include)
+
+ FIND_PATH( ISMRMRD_XSD_INCLUDE_DIR ismrmrd.hxx
+-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
++HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+
+ FIND_PATH( ISMRMRD_SCHEMA_DIR ismrmrd.xsd
+-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
++HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+
+ FIND_LIBRARY( ISMRMRD_LIBRARIES
+ NAMES "ismrmrd"
+@@ -21,7 +21,7 @@
+
+ FIND_FILE( ISMRMRD_XSD_SOURCE
+ NAMES "ismrmrd.cxx"
+- HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
++ HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+
+ INCLUDE( "FindPackageHandleStandardArgs" )
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS( "Ismrmrd" DEFAULT_MSG ISMRMRD_INCLUDE_DIR ISMRMRD_LIBRARIES ISMRMRD_SCHEMA_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index 1b3d1dd..4c0f08d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
002-add-soversion.diff
003-fix-spelling-error-in-shepp-logan-bin
+004-add-debian-support-to-cmake-module.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list