summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-01-05 18:29:22 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-01-05 18:29:22 (GMT)
commit451d98b6ac2439875bdd7d6fa225cc9ac0163dc5 (patch)
treeeb94977c3da988fa952dffa4b6b3e9ebe6d64621
parent96b2abb9bd2d1ef1f890d3767d6471801a1a30e6 (diff)
downloadhdf5-451d98b6ac2439875bdd7d6fa225cc9ac0163dc5.zip
hdf5-451d98b6ac2439875bdd7d6fa225cc9ac0163dc5.tar.gz
hdf5-451d98b6ac2439875bdd7d6fa225cc9ac0163dc5.tar.bz2
[svn-r19914] Correct format of empty parameter
bring r19913 from 1.8
-rw-r--r--config/cmake/HDF5Macros.cmake4
-rw-r--r--fortran/src/CMakeLists.txt2
-rw-r--r--fortran/test/CMakeLists.txt2
-rw-r--r--hl/fortran/src/CMakeLists.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 20b5933..3edb3a2 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -127,13 +127,13 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
ENDMACRO (H5_SET_LIB_OPTIONS)
#-------------------------------------------------------------------------------
-MACRO (TARGET_FORTRAN_WIN_PROPERTIES target add_link_flags)
+MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags)
IF (WIN32)
IF (MSVC)
SET_TARGET_PROPERTIES (${target}
PROPERTIES
COMPILE_FLAGS "/dll"
- LINK_FLAGS "/SUBSYSTEM:CONSOLE ${add_link_flags}"
+ LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
)
ENDIF (MSVC)
ENDIF (WIN32)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 25101b6..6a88eca 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -184,7 +184,7 @@ ENDIF (H5_HAVE_PARALLEL)
# Add Main fortran library
#-----------------------------------------------------------------------------
ADD_LIBRARY (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} ${f90_F_SRCS})
-SET (SHARED_LINK_FLAGS "")
+SET (SHARED_LINK_FLAGS " ")
IF (WIN32 AND NOT CYGWIN)
IF (BUILD_SHARED_LIBS)
SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET}
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index d054ee6..3c905e7 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -30,7 +30,7 @@ ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90)
ADD_DEPENDENCIES(${HDF5_F90_TEST_LIB_TARGET}
${HDF5_F90_C_TEST_LIB_TARGET}
)
-SET (SHARED_LINK_FLAGS "")
+SET (SHARED_LINK_FLAGS " ")
IF (WIN32 AND NOT CYGWIN)
IF (BUILD_SHARED_LIBS)
SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index fecfc15..ca0a35f 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -51,7 +51,7 @@ SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT
H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} ${LIB_TYPE})
ADD_LIBRARY (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
-SET (SHARED_LINK_FLAGS "")
+SET (SHARED_LINK_FLAGS " ")
IF (BUILD_SHARED_LIBS)
IF (WIN32 AND NOT CYGWIN)
SET_PROPERTY (TARGET ${HDF5_HL_F90_LIB_TARGET}