[svn-r19050] Description:

	Bring r18704:19049 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

2 files changed, 196 insertions, 1 deletions

diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
new file mode 100644
index 0000000..7875f97
--- /dev/null
+++ b/fortran/test/CMakeLists.txt
@@ -0,0 +1,195 @@
+cmake_minimum_required (VERSION 2.8)
+PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
+
+#-----------------------------------------------------------------------------
+# Setup include Directories
+#-----------------------------------------------------------------------------
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SOURCE_DIR}/src)
+LINK_DIRECTORIES (
+    ${CMAKE_Fortran_MODULE_DIRECTORY}
+    ${HDF5_F90_BINARY_DIR}
+    ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+)
+
+#-----------------------------------------------------------------------------
+# Add Test Lib
+#-----------------------------------------------------------------------------
+ADD_LIBRARY (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c)
+# Must explicity add a dependency here to force the generation of headers
+# which are created for ${HDF5_F90_C_LIB_TARGET}
+#ADD_DEPENDENCIES(${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} )
+TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET}
+    ${HDF5_F90_C_LIB_TARGET}
+    ${HDF5_TEST_LIB_TARGET}
+)
+H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
+
+ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90)
+# Must explicity add a dependency here to force the generation of headers
+# which are created for ${HDF5_F90_C_LIB_TARGET}
+ADD_DEPENDENCIES(${HDF5_F90_TEST_LIB_TARGET} 
+  ${HDF5_F90_C_TEST_LIB_TARGET}
+)
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
+	    APPEND PROPERTY COMPILE_DEFINITIONS
+		    BUILD_HDF5_DLL
+	)
+    IF (MSVC)
+      SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET}
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE /DLL"
+      )
+    ENDIF (MSVC)
+  ENDIF (BUILD_SHARED_LIBS)
+  SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
+      APPEND PROPERTY COMPILE_DEFINITIONS
+  	    HDF5F90_WINDOWS
+  )
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
+TARGET_LINK_LIBRARIES (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_TARGET})
+H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
+
+#-----------------------------------------------------------------------------
+# Add Tests
+#-----------------------------------------------------------------------------
+
+#-- Adding test for testhdf5_fortran
+ADD_EXECUTABLE (testhdf5_fortran
+    fortranlib_test.f90
+    tH5A.f90
+    tH5D.f90
+    tH5E.f90
+    tH5F.f90
+    tH5G.f90
+    tH5I.f90
+    tH5P.f90
+    tH5R.f90
+    tH5S.f90
+    tH5Sselect.f90
+    tH5T.f90
+    tH5VL.f90
+    tH5Z.f90
+)
+H5_NAMING (testhdf5_fortran)
+TARGET_LINK_LIBRARIES (testhdf5_fortran 
+    ${HDF5_F90_TEST_LIB_TARGET}
+    ${HDF5_F90_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
+IF (WIN32)
+  IF (MSVC)
+    TARGET_LINK_LIBRARIES (testhdf5_fortran "ws2_32.lib")
+    IF (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (testhdf5_fortran
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE"
+      )
+    ELSE (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (testhdf5_fortran
+          PROPERTIES
+              LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+      ) 
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES (testhdf5_fortran PROPERTIES LINKER_LANGUAGE Fortran)
+
+ADD_TEST (NAME testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
+
+#-- Adding test for testhdf5_fortran_1_8
+ADD_EXECUTABLE (testhdf5_fortran_1_8
+    fortranlib_test_1_8.f90
+    tH5F.f90
+    tH5O.f90
+    tH5A_1_8.f90
+    tH5G_1_8.f90
+)
+H5_NAMING (testhdf5_fortran_1_8)
+TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 
+    ${HDF5_F90_TEST_LIB_TARGET}
+    ${HDF5_F90_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
+IF (WIN32)
+  IF (MSVC)
+    TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 "ws2_32.lib")
+    IF (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (testhdf5_fortran_1_8
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE"
+      )
+    ELSE (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (testhdf5_fortran_1_8
+          PROPERTIES
+              LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+      ) 
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran)
+
+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)
+TARGET_LINK_LIBRARIES (fflush1 
+    ${HDF5_F90_LIB_TARGET}
+    ${HDF5_F90_TEST_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
+IF (WIN32)
+  IF (MSVC)
+    TARGET_LINK_LIBRARIES (fflush1 "ws2_32.lib")
+    IF (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (fflush1
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE"
+      )
+    ELSE (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (fflush1
+          PROPERTIES
+              LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+      ) 
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES (fflush1 PROPERTIES LINKER_LANGUAGE Fortran)
+
+ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
+
+#-- Adding test for fflush2
+ADD_EXECUTABLE (fflush2 fflush2.f90)
+H5_NAMING (fflush2)
+TARGET_LINK_LIBRARIES (fflush2 
+    ${HDF5_F90_TEST_LIB_TARGET}
+    ${HDF5_F90_LIB_TARGET}
+    ${HDF5_LIB_TARGET}
+)
+IF (WIN32)
+  IF (MSVC)
+    TARGET_LINK_LIBRARIES (fflush2 "ws2_32.lib")
+    IF (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (fflush2
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE"
+      )
+    ELSE (BUILD_SHARED_LIBS)
+      SET_TARGET_PROPERTIES (fflush2
+          PROPERTIES
+              LINK_FLAGS "/NODEFAULTLIB:MSVCRT"
+      ) 
+    ENDIF (BUILD_SHARED_LIBS)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+SET_TARGET_PROPERTIES (fflush2 PROPERTIES LINKER_LANGUAGE Fortran)
+
+ADD_TEST (NAME fflush2 COMMAND $<TARGET_FILE:fflush2>)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 3de711a..515d66b 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -236,12 +236,12 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTRUMENT = @INSTRUMENT@
 INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+LARGEFILE = @LARGEFILE@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LINUX_LFS = @LINUX_LFS@
 LIPO = @LIPO@
 LL_PATH = @LL_PATH@
 LN_S = @LN_S@