[ismrmrd] 91/281: fix hdf5 cmake in windows

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:01:01 UTC 2015


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 1a2e67b828ce3c507208e6bbb5d01fc524a4eb62
Author: hxue <hui.xue at nih.gov>
Date:   Fri Feb 1 17:05:55 2013 -0500

    fix hdf5 cmake in windows
---
 CMakeLists.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 382efee..a51a30f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,14 +41,14 @@ IF(WIN32)
 	target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/hdf5_cppdll.lib)
 	target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/hdf5_hldll.lib)
 
-	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5dll.lib)
-	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_cppdll.lib)
-	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_hldll.lib)
+	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5ddll.lib)
+	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_cppddll.lib)
+	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_hlddll.lib)
 
-	target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/zlib.lib)
-	target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/szip.lib)
-	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/zlib.lib)
-	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/szip.lib)
+	#target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/zlib.lib)
+	#target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/szip.lib)
+	#target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/zlib.lib)
+	#target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/szip.lib)
 
 	target_link_libraries(ismrmrd ${Boost_LIBRARIES})
 ELSE (WIN32)

-- 
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