[ismrmrd] 272/281: use HDF5_ROOT to find hdf5 in windows, remove the HDF5 DEBUG linkdage

[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 522f681c02bb7c9bc6337613c5600c0020abfb74
Author: Hui Xue <hui.xue at nih.gov>
Date:   Wed Aug 27 17:21:01 2014 -0400

    use HDF5_ROOT to find hdf5 in windows, remove the HDF5 DEBUG linkdage
---
 CMakeLists.txt | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b5fec1..a3011de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,17 +56,7 @@ add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
 include_directories(${HDF5_C_INCLUDE_DIR} ${HDF5_CXX_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR})
 
-#The findHDF5.cmake does not work very well on Windows, let's help it out
-if(WIN32)
-    target_link_libraries(ismrmrd optimized ${HDF5_hdf5_LIBRARY_RELEASE}
-        optimized ${HDF5_hdf5_cpp_LIBRARY_RELEASE})
-    target_link_libraries(ismrmrd debug ${HDF5_hdf5_LIBRARY_DEBUG}
-        debug ${HDF5_hdf5_cpp_LIBRARY_DEBUG})
-    target_link_libraries(ismrmrd ${Boost_LIBRARIES})
-else(WIN32)
-    target_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${Boost_THREAD_LIBRARY}
-        ${Boost_SYSTEM_LIBRARY})
-endif(WIN32)
+target_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 
 install(TARGETS ismrmrd
     DESTINATION ${ISMRMRD_INSTALL_LIB_DIR})
@@ -123,4 +113,4 @@ add_subdirectory(tests)
 add_subdirectory(doc)
 add_subdirectory(matlab)
 add_subdirectory(bindings)
-add_subdirectory(xml)
\ No newline at end of file
+add_subdirectory(xml)

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