philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Allen Byrne
2010-12-30 09:03:15 -05:00
parent a863723db8
commit 8a7bf1ae4e
25 changed files with 35 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config/cmake/HDF5Macros.cmake
View File

@@ -126,21 +126,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)
@@ -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)