[ismrmrd] 257/281: Added ismrmrd_xml library to the find script

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 0c2cc196d44185a29766fc24995cc8d84af52ee9
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Wed Aug 13 16:28:13 2014 -0400

    Added ismrmrd_xml library to the find script
---
 cmake/FindIsmrmrd.cmake | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/cmake/FindIsmrmrd.cmake b/cmake/FindIsmrmrd.cmake
index bfece66..af38720 100644
--- a/cmake/FindIsmrmrd.cmake
+++ b/cmake/FindIsmrmrd.cmake
@@ -1,9 +1,8 @@
 # - Find ISMRMRRD
 #   ISMRMRD_FOUND            - true if an ISMRMRD installation is found.
 #   ISMRMRD_INCLUDE_DIR      - where to find ismrmrd.h, etc.
-#   ISMRMRD_LIBRARIES        - libismrmrd.so.
+#   ISMRMRD_LIBRARIES        - libismrmrd.so and libismrmrd_xml.so
 #   ISMRMRD_XSD_INCLUDE_DIR  - folder containing ismrmrd.hxx (autogenerated from xsd schema)
-#   ISMRMRD_XSD_LIBRARIES    - libismrmrd_xsd.so
 #   ISMRMRD_XSD_SOURCE       - full path to ismrmrd.cxx (autogenerated from xsd schema)
 #   ISMRMRD_SCHEMA_DIR       - where to find ismrmrd.xsd       
 
@@ -11,24 +10,30 @@ FIND_PATH( ISMRMRD_INCLUDE_DIR ismrmrd.h
 HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES include ismrmrd ismrmrd/include)
 
 FIND_PATH( ISMRMRD_XSD_INCLUDE_DIR ismrmrd.hxx
-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
 
 FIND_PATH( ISMRMRD_SCHEMA_DIR ismrmrd.xsd 
-HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
 
-FIND_LIBRARY( ISMRMRD_LIBRARIES
-              NAMES "ismrmrd"
+FIND_LIBRARY( ISMRMRD_LIBRARY
+              NAMES ismrmrd
               PATHS  /usr/local/lib ${ISMRMRD_INCLUDE_DIR}/../lib /usr/lib )
 
-FIND_LIBRARY( ISMRMRD_XSD_LIBRARIES
-              NAMES "ismrmrd_xsd"
+FIND_LIBRARY( ISMRMRD_XML_LIBRARY
+              NAMES ismrmrd_xml
               PATHS  /usr/local/lib ${ISMRMRD_INCLUDE_DIR}/../lib /usr/lib )
 
+SET(ISMRMRD_LIBRARIES ${ISMRMRD_LIBRARY} ${ISMRMRD_XML_LIBRARY})
+
 FIND_FILE( ISMRMRD_XSD_SOURCE
            NAMES "ismrmrd.cxx"
-           HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr /usr/lib PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
+           HINTS $ENV{ISMRMRD_HOME} PATHS /usr/local /usr PATH_SUFFIXES schema ismrmrd ismrmrd/schema)
 
 INCLUDE( "FindPackageHandleStandardArgs" )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( "Ismrmrd" DEFAULT_MSG ISMRMRD_INCLUDE_DIR ISMRMRD_LIBRARIES ISMRMRD_SCHEMA_DIR)
 
 MARK_AS_ADVANCED( ISMRMRD_INCLUDE_DIR ISMRMRD_LIBRARIES ISMRMRD_SCHEMA_DIR)
+
+#if(ISMRMRD_FOUND)
+#  message("ISMRMRD found ${ISMRMRD_LIBRARIES}")
+#endif(ISMRMRD_FOUND)
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git