diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-12-29 18:52:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-12-29 18:52:34 (GMT) |
| commit | 86313eb281deea495200c63f10d5efce38d3350c (patch) | |
| tree | 828875fb28c5483668e28a970306f8a11e5da026 /config | |
| parent | 562ba69f3573acb5dd910dc227ca337320bbae8b (diff) | |
| download | hdf5-86313eb281deea495200c63f10d5efce38d3350c.zip hdf5-86313eb281deea495200c63f10d5efce38d3350c.tar.gz hdf5-86313eb281deea495200c63f10d5efce38d3350c.tar.bz2 | |
[svn-r19895] 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')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 9 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 23 |
2 files changed, 9 insertions, 23 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 51140f2..0dbd1ec 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -16,12 +16,21 @@ /* Defined if HDF5 was built with CMake AND build as a shared library */ #cmakedefine H5_BUILT_AS_DYNAMIC_LIB @H5_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 was built with CMake AND build as a static library */ +#cmakedefine H5_BUILT_AS_STATIC_LIB @H5_BUILT_AS_STATIC_LIB@ + /* Defined if HDF5 CPP was built with CMake AND build as a shared library */ #cmakedefine H5_CPP_BUILT_AS_DYNAMIC_LIB @H5_CPP_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 CPP was built with CMake AND build as a static library */ +#cmakedefine H5_CPP_BUILT_AS_STATIC_LIB @H5_CPP_BUILT_AS_STATIC_LIB@ + /* Defined if HDF5 HL was built with CMake AND build as a shared library */ #cmakedefine H5_HL_BUILT_AS_DYNAMIC_LIB @H5_HL_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 HL was built with CMake AND build as a static library */ +#cmakedefine H5_HL_BUILT_AS_STATIC_LIB @H5_HL_BUILT_AS_STATIC_LIB@ + /* Define if building universal (internal helper macro) */ #cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@ 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) |