[svn-r20128] Add fortran mod folder to INCLUDE_DIRS for gfortran 4.2.x.

Add test dependicies to correct the order of tests - cmake 2.8.4 bug - but also will improve cmake parallel testing.

Tested: local linux, jam

7 files changed, 45 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e531dd1..03bf4c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,7 +491,6 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
               # [SVN_REVISION rev] 
               INSTALL_COMMAND ""
               CMAKE_ARGS
-                  -DBLDTYPE:STRING=Release
                   -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
           ) 
         ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
@@ -502,7 +501,6 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
               URL_MD5 ""
               INSTALL_COMMAND ""
               CMAKE_ARGS
-                  -DBLDTYPE:STRING=Release
                   -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
           ) 
         ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
@@ -581,7 +579,6 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
             # [SVN_REVISION rev] 
             INSTALL_COMMAND ""
             CMAKE_ARGS
-                -DBLDTYPE:STRING=Release
                 -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
                 -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING}
         ) 
@@ -593,7 +590,6 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
             URL_MD5 ""
             INSTALL_COMMAND ""
             CMAKE_ARGS
-                -DBLDTYPE:STRING=Release
                 -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
                 -DSZIP_ENABLE_ENCODING:BOOL=${HDF5_ENABLE_SZIP_ENCODING}
         ) 
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index af9d5a3..d5cbc1b 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -74,7 +74,7 @@ ADD_CUSTOM_COMMAND (
     DEPENDS H5fortran_detect
 )
 
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR})
+INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
 #-----------------------------------------------------------------------------
 ADD_EXECUTABLE (H5match_types
     ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 11f6273..9eec6e2 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF (BUILD_SHARED_LIBS)
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/src ${CMAKE_Fortran_MODULE_DIRECTORY})
 
 SET (HL_SRCS
     ${HDF5_HL_SRC_SOURCE_DIR}/H5DS.c
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d68e661..98ecf9b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -293,9 +293,11 @@ SET (H5_TESTS
 )
 
 FOREACH (test ${H5_TESTS})
-    ADD_H5_TEST(${test})
+  ADD_H5_TEST(${test})
+  SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS h5test-clear-objects)
 ENDFOREACH (test ${H5_TESTS})
 
+SET_TESTS_PROPERTIES(flush2 PROPERTIES DEPENDS flush1)
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index bc3ccd1..2f39282 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -94,10 +94,15 @@ IF (BUILD_TESTING)
           NAME H5COPY-DIFF_${testname}
           COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${testfile}.h5 ./testfiles/${testfile}.out.h5 ${srcname} ${dstname}
       )
+      SET_TESTS_PROPERTIES(H5COPY-DIFF_${testname} PROPERTIES DEPENDS H5COPY-${testname})
       IF (${resultcode} STREQUAL "1")
         SET_TESTS_PROPERTIES (H5COPY-DIFF_${testname} PROPERTIES WILL_FAIL "true")
       ENDIF (${resultcode} STREQUAL "1")
     ENDIF (NOT ${resultcode} STREQUAL "2")
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (H5COPY-${testname} PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "H5COPY-DIFF_${testname}")
   ENDMACRO (ADD_H5_TEST testname resultcode testfile vparam srcname dstname)
 
   MACRO (ADD_H5LS_TEST file filetest)
@@ -113,6 +118,10 @@ IF (BUILD_TESTING)
             -D "TEST_MASK=true"
             -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
     )
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (H5COPY-H5LS_${file}-${filetest} PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "H5COPY-H5LS_${file}-${filetest}")
   ENDMACRO (ADD_H5LS_TEST file filetest)
 
   MACRO (ADD_H5_CMP_TEST testname resultcode testfile vparam srcname dstname)
@@ -128,6 +137,10 @@ IF (BUILD_TESTING)
             -D "TEST_MASK=true"
             -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
     )
+    IF (NOT "${last_test}" STREQUAL "")
+      SET_TESTS_PROPERTIES (H5COPY-CMP-${testname} PROPERTIES DEPENDS ${last_test})
+    ENDIF (NOT "${last_test}" STREQUAL "")
+    SET (last_test "H5COPY-CMP-${testname}")
   ENDMACRO (ADD_H5_CMP_TEST testname resultcode testfile vparam srcname dstname)
 
 ##############################################################################
@@ -159,6 +172,10 @@ IF (BUILD_TESTING)
           ./testfiles/${HDF_EXT_SRC_FILE}.out.out
           ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err
   )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (H5COPY-clearall-objects PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "H5COPY-clearall-objects")
   
   # "Test copying various forms of datasets"
   ADD_H5_TEST (simple 0 ${HDF_FILE1} v simple simple)
@@ -210,6 +227,10 @@ IF (BUILD_TESTING)
           ./testfiles/${HDF_FILE2}.out.out
           ./testfiles/${HDF_FILE2}.out.out.err
   )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (H5COPY-clear-refs PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "H5COPY-clear-refs")
 
   # "Test copying object and region references"
   ADD_H5_TEST (region_ref 2 ${HDF_FILE2} v / /COPY ref)
@@ -228,6 +249,10 @@ IF (BUILD_TESTING)
           ./testfiles/${HDF_EXT_SRC_FILE}.out.out
           ./testfiles/${HDF_EXT_SRC_FILE}.out.out.err
   )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (H5COPY-clear-ext-links PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "H5COPY-clear-ext-links")
 
   # "Test copying external link directly without -f ext"
   ADD_H5_TEST (ext_link 2 ${HDF_EXT_SRC_FILE} v /group_ext/extlink_dset /copy1_dset)
@@ -274,6 +299,10 @@ IF (BUILD_TESTING)
           ./testfiles/${HDF_FILE1}.out.out
           ./testfiles/${HDF_FILE1}.out.out.err
   )
+  IF (NOT "${last_test}" STREQUAL "")
+    SET_TESTS_PROPERTIES (H5COPY-clear-misc PROPERTIES DEPENDS ${last_test})
+  ENDIF (NOT "${last_test}" STREQUAL "")
+  SET (last_test "H5COPY-clear-misc")
 
   # "Test copying object into group which doesn't exist, without -p"
   ADD_H5_CMP_TEST (h5copy_misc1 1 ${HDF_FILE1} v /simple /g1/g2/simple)
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 76f3896..ae81d7b 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -59,6 +59,7 @@ IF (BUILD_TESTING)
   TARGET_LINK_LIBRARIES (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 
   ADD_TEST (NAME h5repacktest COMMAND $<TARGET_FILE:h5repacktest>)
+  SET_TESTS_PROPERTIES (h5repacktest PROPERTIES DEPENDS testh5repack_detect_szip)
 
   IF (HDF5_TEST_VFD)
 
@@ -176,10 +177,12 @@ IF (BUILD_TESTING)
           NAME H5REPACK-${testname}
           COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile}
       )
+      SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-clearall-objects)
       ADD_TEST (
           NAME H5REPACK-DIFF_${testname}
           COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile}
       )
+      SET_TESTS_PROPERTIES (H5REPACK-DIFF_${testname} PROPERTIES DEPENDS H5REPACK-${testname})
     ENDIF (${testtype} STREQUAL "SKIP")
   ENDMACRO (ADD_H5_TEST)
 
@@ -225,6 +228,7 @@ IF (BUILD_TESTING)
                 -D "TEST_REFERENCE=${testfilter}"
                 -P "${HDF5_RESOURCES_DIR}/grepTest.cmake"
         )
+        SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK-${testname})
       ELSE (${resultcode} STREQUAL "0")
         IF (${testfilter} STREQUAL "CHUNKED")
           SET (nottestfilter "(CONTIGUOUS|COMPACT)")
@@ -247,6 +251,7 @@ IF (BUILD_TESTING)
                 -D "TEST_REFERENCE=${testfilter}"
                 -P "${HDF5_RESOURCES_DIR}/grepTest.cmake"
         )
+        SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT_ALL-${testname} PROPERTIES DEPENDS H5REPACK-${testname})
       ENDIF (${resultcode} STREQUAL "0")
     ENDIF (${testtype} STREQUAL "SKIP")
   ENDMACRO (ADD_H5_VERIFY_TEST)
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index e94d9dc..6694458 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -144,6 +144,7 @@ IF (BUILD_TESTING)
           COMMAND $<TARGET_FILE:h5mkgrp> ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN}
       )
     ENDIF (NOT ${resultoption} STREQUAL " ")
+    SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption})
     ADD_TEST (
         NAME H5MKGRP-H5LS-${resultfile}${resultoption}
         COMMAND "${CMAKE_COMMAND}"
@@ -156,6 +157,7 @@ IF (BUILD_TESTING)
             -D "TEST_REFERENCE=${resultfile}.ls"
             -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
     )
+    SET_TESTS_PROPERTIES (H5MKGRP-H5LS-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption})
   ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption)
 
   MACRO (ADD_H5_CMP resultfile resultcode)
@@ -187,6 +189,7 @@ IF (BUILD_TESTING)
   )
   # repartition family member size to 20,000 bytes.
   ADD_TEST (NAME h5repart_20K COMMAND $<TARGET_FILE:h5repart> -m 20000 family_file%05d.h5 fst_family%05d.h5)
+  SET_TESTS_PROPERTIES (h5repart_20K PROPERTIES DEPENDS h5repart_20K-clear-objects)
 
   # Remove any output file left over from previous test run
   ADD_TEST (
@@ -200,6 +203,7 @@ IF (BUILD_TESTING)
   )
   # repartition family member size to 5 KB.
   ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5)
+  SET_TESTS_PROPERTIES (h5repart_5K PROPERTIES DEPENDS h5repart_5K-clear-objects)
 
   # Remove any output file left over from previous test run
   ADD_TEST (
@@ -210,9 +214,11 @@ IF (BUILD_TESTING)
   )
   # convert family file to sec2 file of 20,000 bytes
   ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5)
+  SET_TESTS_PROPERTIES (h5repart_sec2 PROPERTIES DEPENDS h5repart_sec2-clear-objects)
 
   # test the output files repartitioned above.
   ADD_TEST (NAME h5repart_test COMMAND $<TARGET_FILE:h5repart_test>)
+  SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2 h5repart_5K h5repart_20K)
 
   SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
         h5repart_test