diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-08-10 21:17:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-08-10 21:17:22 (GMT) |
| commit | 3a448c4f8565178cf218e138086d46bfa5f66e91 (patch) | |
| tree | 3ee6043c714a0c00eaab5dd42f18a42c88d570e0 | |
| parent | ec76ca98c1a11b4943d39ff392d214c61eebc7cb (diff) | |
| download | hdf5-3a448c4f8565178cf218e138086d46bfa5f66e91.zip hdf5-3a448c4f8565178cf218e138086d46bfa5f66e91.tar.gz hdf5-3a448c4f8565178cf218e138086d46bfa5f66e91.tar.bz2 | |
[svn-r21218] Corrected cmake installed library build indicator.
Added COMPILE_FLAGS for windows fortran builds
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 14 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.build.in | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 28f9eba..36f0a2b 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -389,13 +389,19 @@ ENDMACRO (HDF_SET_LIB_OPTIONS) #------------------------------------------------------------------------------- MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags) - IF (WIN32) - IF (MSVC) + IF (WIN32 AND MSVC) + IF (BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES (${target} PROPERTIES COMPILE_FLAGS "/dll" LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}" ) - ENDIF (MSVC) - ENDIF (WIN32) + ELSE (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (${target} + PROPERTIES + COMPILE_FLAGS "/MD" + LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}" + ) + ENDIF (BUILD_SHARED_LIBS) + ENDIF (WIN32 AND MSVC) ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES) diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in index f51ef2e..35090fc 100644 --- a/config/cmake/hdf5-config.cmake.build.in +++ b/config/cmake/hdf5-config.cmake.build.in @@ -14,7 +14,7 @@ SET (HDF5_BUILD_HL_LIB @HDF5_BUILD_HL_LIB@) SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
-SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+SET (HDF5_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
#-----------------------------------------------------------------------------
# Directories
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index d079950..189a66c 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -17,7 +17,7 @@ SET (HDF5_BUILD_HL_LIB @HDF5_BUILD_HL_LIB@) SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
-SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
+SET (HDF5_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
SET (HDF5_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@)
#-----------------------------------------------------------------------------
|