[ismrmrd] 18/281: Small fixes for compilation on Mac

[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 a8ec56fa655e62ed5313335c01d65c8725375368
Author: Michael Hansen <michael.hansen at nih.gov>
Date:   Thu Aug 30 20:58:27 2012 -0400

    Small fixes for compilation on Mac
---
 CMakeLists.txt          | 10 +++++-----
 cmake/FindXercesC.cmake |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2196ec7..375b77d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,16 +6,16 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 find_package(XSD REQUIRED)
 find_package(XercesC REQUIRED)
-find_package(Boost REQUIRED)
-find_package(HDF5 1.8 COMPONENTS C CXX REQUIRED)
+find_package(Boost 1.48 COMPONENTS thread system REQUIRED)
+find_package(HDF5 1.8 COMPONENTS C CXX HL REQUIRED)
 
 #Process the XSD files
 SET(XSDS schema/ismrmrd.xsd)
 SET(XSD_ARGS cxx-tree --generate-serialization --export-symbol EXPORTISMRMRD --hxx-prologue-file ${CMAKE_SOURCE_DIR}/ismrmrd_export.h)
 WRAP_XSD(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
-INCLUDE_DIRECTORIES(${XSD_INCLUDES} ${XERCESC_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${HDF5_INCLUDES})
+INCLUDE_DIRECTORIES(${XSD_INCLUDES} ${XERCESC_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${HDF5_INCLUDE_DIR})
 add_library(ismrmrd SHARED ismrmrd_hdf5.cpp ${XSDS_SOURCES})
-target_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${XERCESC_LIBRARIES})
+target_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${XERCESC_LIBRARIES} ${Boost_LIBRARIES})
 
 add_executable(ismrmrd_test main.cpp ${XSDS_SOURCES})
 target_link_libraries(ismrmrd_test ${XERCESC_LIBRARIES} ismrmrd)
@@ -26,4 +26,4 @@ INSTALL(FILES cmake/FindIsmrmrd.cmake DESTINATION cmake)
 INSTALL(TARGETS ismrmrd DESTINATION lib)
 INSTALL(TARGETS ismrmrd_test DESTINATION bin)
 
-add_subdirectory(doc)
\ No newline at end of file
+add_subdirectory(doc)
diff --git a/cmake/FindXercesC.cmake b/cmake/FindXercesC.cmake
index 3bb9b81..2a40c5b 100644
--- a/cmake/FindXercesC.cmake
+++ b/cmake/FindXercesC.cmake
@@ -9,6 +9,7 @@ FIND_PATH(XERCESC_INCLUDE_DIR xercesc/dom/DOM.hpp
   $ENV{XERCESCROOT}/src/
   /usr/local/include
   /usr/include
+  /opt/local/include
 )
 
 FIND_LIBRARY(XERCESC_LIBRARIES
@@ -20,6 +21,7 @@ FIND_LIBRARY(XERCESC_LIBRARIES
     $ENV{XERCESCROOT}/lib
     /usr/local/lib
     /usr/lib
+    /opt/local/lib
 )
 
 # if the include a the library are found then we have it

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