diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-12-30 14:03:15 (GMT) |
| commit | 8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4 (patch) | |
| tree | af334956696330b4ce9811ca890d41bfd44770e2 /config/cmake/HDF5Macros.cmake | |
| parent | a863723db866ed63377aecd1e90cffa08f43c020 (diff) | |
| download | hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.zip hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.gz hdf5-8a7bf1ae4efd144ddf77f2a1c9701c36f913b5a4.tar.bz2 | |
[svn-r19898] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries.
Diffstat (limited to 'config/cmake/HDF5Macros.cmake')
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 6146e66..5e41f35 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -127,21 +127,6 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) ENDMACRO (H5_SET_LIB_OPTIONS) #------------------------------------------------------------------------------- -MACRO (TARGET_WIN_PROPERTIES target) - IF (WIN32) - IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (${target} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRTD" - ) - ENDIF (NOT BUILD_SHARED_LIBS) - ENDIF (MSVC) - ENDIF (WIN32) -ENDMACRO (TARGET_WIN_PROPERTIES) - -#------------------------------------------------------------------------------- MACRO (TARGET_FORTRAN_WIN_PROPERTIES target) IF (WIN32) IF (BUILD_SHARED_LIBS) @@ -152,14 +137,6 @@ MACRO (TARGET_FORTRAN_WIN_PROPERTIES target) LINK_FLAGS "/SUBSYSTEM:CONSOLE" ) ENDIF (MSVC) - ELSE (BUILD_SHARED_LIBS) - IF (MSVC) - SET_TARGET_PROPERTIES (${target} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRTD" - ) - ENDIF (MSVC) ENDIF (BUILD_SHARED_LIBS) ENDIF (WIN32) ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES) |