summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-01-05 14:45:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-01-05 14:45:09 (GMT)
commit865cc514351c7088e5b5b7dfcbedb7c58e147c1b (patch)
tree2926ddcfd6219e96c4fcb9636dea9f02c8d23cc5 /fortran
parent3771df0757094854a676be888e777e1d4c690aa7 (diff)
downloadhdf5-865cc514351c7088e5b5b7dfcbedb7c58e147c1b.zip
hdf5-865cc514351c7088e5b5b7dfcbedb7c58e147c1b.tar.gz
hdf5-865cc514351c7088e5b5b7dfcbedb7c58e147c1b.tar.bz2
[svn-r19908] Change how LINK_FLAGS for fortran are appended on Windows
Diffstat (limited to 'fortran')
-rw-r--r--fortran/examples/CMakeLists.txt4
-rw-r--r--fortran/src/CMakeLists.txt8
-rw-r--r--fortran/test/CMakeLists.txt10
-rw-r--r--fortran/testpar/CMakeLists.txt2
4 files changed, 9 insertions, 15 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index b0c46c5..c0ddf32 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -38,7 +38,7 @@ SET (examples
FOREACH (example ${examples})
ADD_EXECUTABLE (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
H5_NAMING (f90_ex_${example} ${LIB_TYPE})
- TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_${example})
+ TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_${example} "")
IF (WIN32 AND NOT CYGWIN)
SET_PROPERTY (TARGET f90_ex_${example}
APPEND PROPERTY COMPILE_DEFINITIONS
@@ -60,7 +60,7 @@ ENDFOREACH (example ${examples})
IF (H5_HAVE_PARALLEL)
ADD_EXECUTABLE (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
H5_NAMING (f90_ex_ph5example ${LIB_TYPE})
- TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_ph5example)
+ TARGET_FORTRAN_WIN_PROPERTIES (f90_ex_ph5example "")
IF (WIN32 AND NOT CYGWIN)
SET_PROPERTY (TARGET f90_ex_ph5example
APPEND PROPERTY COMPILE_DEFINITIONS
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 8ad5000..9da2af7 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -184,19 +184,13 @@ ENDIF (H5_HAVE_PARALLEL)
# Add Main fortran library
#-----------------------------------------------------------------------------
ADD_LIBRARY (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} ${f90_F_SRCS})
-TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_LIB_TARGET})
+TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_LIB_TARGET} "/DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def")
IF (WIN32 AND NOT CYGWIN)
IF (BUILD_SHARED_LIBS)
SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
BUILD_HDF5_DLL
)
- IF (MSVC)
- SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET}
- APPEND PROPERTY LINK_FLAGS
- "/DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def"
- )
- ENDIF (MSVC)
ENDIF (BUILD_SHARED_LIBS)
SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET}
APPEND PROPERTY COMPILE_DEFINITIONS
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index f69753b..775e5c5 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}
)
-TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET})
+TARGET_FORTRAN_WIN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} "/DLL")
IF (WIN32 AND NOT CYGWIN)
IF (BUILD_SHARED_LIBS)
SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
@@ -75,7 +75,7 @@ ADD_EXECUTABLE (testhdf5_fortran
tH5Z.f90
)
H5_NAMING (testhdf5_fortran ${LIB_TYPE})
-TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran)
+TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran "")
TARGET_LINK_LIBRARIES (testhdf5_fortran
${HDF5_F90_TEST_LIB_TARGET}
${HDF5_F90_LIB_TARGET}
@@ -97,7 +97,7 @@ ADD_EXECUTABLE (testhdf5_fortran_1_8
tH5G_1_8.f90
)
H5_NAMING (testhdf5_fortran_1_8 ${LIB_TYPE})
-TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran_1_8)
+TARGET_FORTRAN_WIN_PROPERTIES (testhdf5_fortran_1_8 "")
TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8
${HDF5_F90_TEST_LIB_TARGET}
${HDF5_F90_LIB_TARGET}
@@ -113,7 +113,7 @@ ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
#-- Adding test for fflush1
ADD_EXECUTABLE (fflush1 fflush1.f90)
H5_NAMING (fflush1 ${LIB_TYPE})
-TARGET_FORTRAN_WIN_PROPERTIES (fflush1)
+TARGET_FORTRAN_WIN_PROPERTIES (fflush1 "")
TARGET_LINK_LIBRARIES (fflush1
${HDF5_F90_LIB_TARGET}
${HDF5_F90_TEST_LIB_TARGET}
@@ -129,7 +129,7 @@ ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
#-- Adding test for fflush2
ADD_EXECUTABLE (fflush2 fflush2.f90)
H5_NAMING (fflush2 ${LIB_TYPE})
-TARGET_FORTRAN_WIN_PROPERTIES (fflush2)
+TARGET_FORTRAN_WIN_PROPERTIES (fflush2 "")
TARGET_LINK_LIBRARIES (fflush2
${HDF5_F90_TEST_LIB_TARGET}
${HDF5_F90_LIB_TARGET}
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 0a2062d..9cfbae5 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_EXECUTABLE (parallel_test
mdset.f90
)
H5_NAMING (parallel_test ${LIB_TYPE})
-TARGET_FORTRAN_WIN_PROPERTIES (parallel_test)
+TARGET_FORTRAN_WIN_PROPERTIES (parallel_test "")
TARGET_LINK_LIBRARIES (parallel_test
${HDF5_F90_TEST_LIB_TARGET}
${HDF5_F90_LIB_TARGET}