[svn-r24948] Group tests by Common name

Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32

Tested: local linux CMake

7 files changed, 32 insertions, 28 deletions

diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake
index dc279e5..bac9fdf 100644
--- a/hl/c++/examples/CMakeTests.cmake
+++ b/hl/c++/examples/CMakeTests.cmake
@@ -6,11 +6,11 @@
 ##############################################################################
 # Remove any output file left over from previous test run
 add_test (
-    NAME cpp_hl_ex_ptExampleFL-clear-objects
+    NAME HL_CPP_ex_ptExampleFL-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
             PTcppexampleFL.h5
 )
 
-add_test (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
-set_tests_properties (cpp_hl_ex_ptExampleFL PROPERTIES DEPENDS cpp_hl_ex_ptExampleFL-clear-objects)
+add_test (NAME HL_CPP_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
+set_tests_properties (HL_CPP_ex_ptExampleFL PROPERTIES DEPENDS HL_CPP_ex_ptExampleFL-clear-objects)
diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake
index 5386624..e36b5aa 100644
--- a/hl/c++/test/CMakeTests.cmake
+++ b/hl/c++/test/CMakeTests.cmake
@@ -5,4 +5,4 @@
 ##############################################################################
 ##############################################################################
   
-  add_test (NAME hl_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)
+  add_test (NAME HL_CPP_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>)
diff --git a/hl/examples/CMakeTests.cmake b/hl/examples/CMakeTests.cmake
index bc51183..8cf74d9 100644
--- a/hl/examples/CMakeTests.cmake
+++ b/hl/examples/CMakeTests.cmake
@@ -23,7 +23,7 @@ endforeach (h5_file ${HDF5_TEST_FILES})
 
   # Remove any output file left over from previous test run
   add_test (
-      NAME hl_ex-clear-objects
+      NAME HL_ex-clear-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
     ex_lite1.h5
@@ -47,14 +47,14 @@ endforeach (h5_file ${HDF5_TEST_FILES})
     ex_ds1.h5
   )
   if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (hl_ex-clear-objects PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (HL_ex-clear-objects PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
-  set (last_test "hl_ex-clear-objects")
+  set (last_test "HL_ex-clear-objects")
 
 foreach (example ${examples})
-  add_test (NAME hl_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
+  add_test (NAME HL_ex_${example} COMMAND $<TARGET_FILE:hl_ex_${example}>)
     if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (hl_ex_${example} PROPERTIES DEPENDS ${last_test})
+      set_tests_properties (HL_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "hl_ex_${example}")
+    set (last_test "HL_ex_${example}")
 endforeach (example ${examples})
diff --git a/hl/fortran/examples/CMakeTests.cmake b/hl/fortran/examples/CMakeTests.cmake
index 1784041..954a01b 100644
--- a/hl/fortran/examples/CMakeTests.cmake
+++ b/hl/fortran/examples/CMakeTests.cmake
@@ -6,5 +6,5 @@
 ##############################################################################
 
 foreach (example ${examples})
-  add_test (NAME hl_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
+  add_test (NAME HL_FORTRAN_f90_ex_${example} COMMAND $<TARGET_FILE:hl_f90_ex_${example}>)
 endforeach (example ${examples})
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index a95873b..c5b2d57 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set (HDF5_HL_F90_F_SRCS
 add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
 set (SHARED_LINK_FLAGS " ")
 if (BUILD_SHARED_LIBS)
-  if (WIN32 AND NOT CYGWIN)
+  if (WIN32)
     set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} 
       APPEND PROPERTY COMPILE_DEFINITIONS 
         BUILD_HDF5_DLL
@@ -57,14 +57,14 @@ if (BUILD_SHARED_LIBS)
     if (MSVC)
       set (SHARED_LINK_FLAGS "/DLL")
     endif (MSVC)
-  endif (WIN32 AND NOT CYGWIN)
+  endif (WIN32)
 endif (BUILD_SHARED_LIBS)
-if (WIN32 AND NOT CYGWIN)
+if (WIN32)
   set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} 
       APPEND PROPERTY COMPILE_DEFINITIONS 
         HDF5F90_WINDOWS
   )
-endif (WIN32 AND NOT CYGWIN)
+endif (WIN32)
 TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} " " ${SHARED_LINK_FLAGS})
 set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran)
 target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
@@ -78,7 +78,7 @@ set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
-if (WIN32 AND NOT CYGWIN)
+if (WIN32)
   install (
       FILES
           ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE}/h5ds.mod
@@ -90,7 +90,7 @@ if (WIN32 AND NOT CYGWIN)
       COMPONENT
           fortheaders
   )
-else (WIN32 AND NOT CYGWIN)
+else (WIN32)
   install (
       FILES
           ${CMAKE_Fortran_MODULE_DIRECTORY}/h5ds.mod
@@ -102,7 +102,7 @@ else (WIN32 AND NOT CYGWIN)
       COMPONENT
           fortheaders
   )
-endif (WIN32 AND NOT CYGWIN)
+endif (WIN32)
 
 #-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
diff --git a/hl/fortran/test/CMakeTests.cmake b/hl/fortran/test/CMakeTests.cmake
index 94bb385..3676d24 100644
--- a/hl/fortran/test/CMakeTests.cmake
+++ b/hl/fortran/test/CMakeTests.cmake
@@ -7,7 +7,7 @@
 
 # Remove any output file left over from previous test run
 add_test (
-    NAME hl_fortran_test-clear-objects
+    NAME HL_FORTRAN_test-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         dsetf1.h5
@@ -20,10 +20,14 @@ add_test (
         tstds.h5
 )
 
-add_test (NAME hl_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
+add_test (NAME HL_FORTRAN_f90_tstds COMMAND $<TARGET_FILE:hl_f90_tstds>)
+set_tests_properties (HL_FORTRAN_f90_tstds PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
 
-add_test (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
+add_test (NAME HL_FORTRAN_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>)
+set_tests_properties (HL_FORTRAN_f90_tstlite PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
 
-add_test (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
+add_test (NAME HL_FORTRAN_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>)
+set_tests_properties (HL_FORTRAN_f90_tstimage PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
 
-add_test (NAME hl_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
+add_test (NAME HL_FORTRAN_f90_tsttable COMMAND $<TARGET_FILE:hl_f90_tsttable>)
+set_tests_properties (HL_FORTRAN_f90_tsttable PROPERTIES DEPENDS HL_FORTRAN_test-clear-objects)
diff --git a/hl/test/CMakeTests.cmake b/hl/test/CMakeTests.cmake
index fda388a..7d632cc 100644
--- a/hl/test/CMakeTests.cmake
+++ b/hl/test/CMakeTests.cmake
@@ -9,9 +9,9 @@
 #  Macro used to add a unit test
 # --------------------------------------------------------------------
 MACRO (HL_ADD_TEST hl_name files)
-  add_test (NAME hl_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
+  add_test (NAME HL_${hl_name} COMMAND $<TARGET_FILE:hl_${hl_name}>)
   if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (hl_${hl_name} PROPERTIES DEPENDS ${last_test})
+    set_tests_properties (HL_${hl_name} PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
 
   # --------------------------------------------------------------------
@@ -32,7 +32,7 @@ ENDMACRO (HL_ADD_TEST)
 
 # Remove any output file left over from previous test run
 add_test (
-    NAME hl_test-clear-objects
+    NAME HL_test-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         combine_tables1.h5
@@ -61,9 +61,9 @@ add_test (
         test_table.h5
 )
 if (NOT "${last_test}" STREQUAL "")
-  set_tests_properties (hl_test-clear-objects PROPERTIES DEPENDS ${last_test})
+  set_tests_properties (HL_test-clear-objects PROPERTIES DEPENDS ${last_test})
 endif (NOT "${last_test}" STREQUAL "")
-set (last_test "hl_test-clear-objects")
+set (last_test "HL_test-clear-objects")
 
 HL_add_test (test_ds "dsdata.txt;dslat.txt;dslon.txt;test_ds_be.h5;test_ds_le.h5")
 HL_add_test (test_dset_opt "")