summaryrefslogtreecommitdiffstats
path: root/hl/tools
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-01-04 18:23:24 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-01-04 18:23:24 (GMT)
commit3771df0757094854a676be888e777e1d4c690aa7 (patch)
tree82f56039821bb1468c3d7d92badb01b4418d59d1 /hl/tools
parentdfd0f597b1eda415d4f0db04d9717ec479b2c89f (diff)
downloadhdf5-3771df0757094854a676be888e777e1d4c690aa7.zip
hdf5-3771df0757094854a676be888e777e1d4c690aa7.tar.gz
hdf5-3771df0757094854a676be888e777e1d4c690aa7.tar.bz2
[svn-r19906] Windows: Correct how fortran links in CRT library. Also correct macro use for checking libtype.
Tested: Windows
Diffstat (limited to 'hl/tools')
-rw-r--r--hl/tools/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 2399335..df45631 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5)
ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS})
-H5_NAMING (gif2h5)
+H5_NAMING (gif2h5 ${LIB_TYPE})
TARGET_LINK_LIBRARIES (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
#-- Add h52gif program
@@ -27,7 +27,7 @@ SET (hdf2gif_SRCS
${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/hdfgifwr.c
)
ADD_EXECUTABLE (hdf2gif ${hdf2gif_SRCS})
-H5_NAMING (hdf2gif)
+H5_NAMING (hdf2gif ${LIB_TYPE})
TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
# --------------------------------------------------------------------
@@ -37,7 +37,7 @@ TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_T
# --------------------------------------------------------------------
IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c)
- H5_NAMING (hl_h52gifgentest)
+ H5_NAMING (hl_h52gifgentest ${LIB_TYPE})
TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
# ADD_TEST (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>)