summaryrefslogtreecommitdiffstats
path: root/config/cmake/HDF5Macros.cmake
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-11-02 20:14:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-11-02 20:14:08 (GMT)
commit315eb0a1687071ca5c09e46efd88073bea118348 (patch)
tree8b2edd984ff2520a832347675ac175beb3bed393 /config/cmake/HDF5Macros.cmake
parenta9ca88d1564351db7ca9371eeede12473b26a6a6 (diff)
downloadhdf5-315eb0a1687071ca5c09e46efd88073bea118348.zip
hdf5-315eb0a1687071ca5c09e46efd88073bea118348.tar.gz
hdf5-315eb0a1687071ca5c09e46efd88073bea118348.tar.bz2
[svn-r19715] Description:
Bring r19697:19714 from trunk to revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode
Diffstat (limited to 'config/cmake/HDF5Macros.cmake')
-rw-r--r--config/cmake/HDF5Macros.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 99fbea1..a20e3b5 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -128,6 +128,7 @@ MACRO (TARGET_WIN_PROPERTIES target)
SET_TARGET_PROPERTIES (${target}
PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+ LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRTD"
)
ENDIF (NOT BUILD_SHARED_LIBS)
ENDIF (MSVC)
@@ -150,6 +151,7 @@ MACRO (TARGET_FORTRAN_WIN_PROPERTIES target)
SET_TARGET_PROPERTIES (${target}
PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+ LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRTD"
)
ENDIF (MSVC)
ENDIF (BUILD_SHARED_LIBS)