diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-11-01 15:58:00 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-11-01 15:58:00 (GMT) |
| commit | ac8e3e509fef92b9d2762b71e1691efba322517a (patch) | |
| tree | 4f3f83141f1c76a7417fdc88b5d515394bb84ec2 /config/cmake/HDF5Macros.cmake | |
| parent | 2c45d801c9dc9c390f797af20a58d2f0740c66d8 (diff) | |
| download | hdf5-ac8e3e509fef92b9d2762b71e1691efba322517a.zip hdf5-ac8e3e509fef92b9d2762b71e1691efba322517a.tar.gz hdf5-ac8e3e509fef92b9d2762b71e1691efba322517a.tar.bz2 | |
[svn-r19703] Removed special fheap timeout - replaced by timeout set in CTestConfig.ctest
Added MemCheck Ignore tests for repeated tools tests
Added Debug flag for windows
Bring r19702 from trunk
Diffstat (limited to 'config/cmake/HDF5Macros.cmake')
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 2 |
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) |