[svn-r24782] HDFFV-8700 -

KitWare recommendations: Change CMake commands to lower case.

2 files changed, 56 insertions, 53 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ff975f0..7bc9d3b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions (${HDF5_EXTRA_C_FLAGS})
 # Generate the H5srcdir_str.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
 set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-CONFIGURE_FILE (${HDF5_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
+configure_file (${HDF5_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
 
 #-----------------------------------------------------------------------------
@@ -36,7 +36,10 @@ if (MINGW)
 endif (MINGW)
 target_link_libraries (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE})
-set_target_properties (${HDF5_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test)
+set_target_properties (${HDF5_TEST_LIB_TARGET} PROPERTIES
+    FOLDER libraries/test
+    INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+)
 
 #-----------------------------------------------------------------------------
 # If plugin library tests can be tested
@@ -290,7 +293,7 @@ set_target_properties (links_env PROPERTIES FOLDER test)
 
 #-- Adding test for libinfo
 set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
-FILE (WRITE ${GREP_RUNNER} 
+file (WRITE ${GREP_RUNNER} 
   "FILE (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
 if (\${TEST_RESULT} STREQUAL \"0\")
   message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index dbfe489..33fbff6 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -137,7 +137,7 @@ foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
 endforeach (h5_file ${HDF5_REFERENCE_TEST_FILES})
 
 # Remove any output file left over from previous test run
-ADD_TEST (
+add_test (
     NAME h5test-clear-testhdf5-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
@@ -161,21 +161,21 @@ ADD_TEST (
 )
 
 if (HDF5_ENABLE_USING_MEMCHECKER)
-  ADD_TEST (NAME testhdf5-base COMMAND $<TARGET_FILE:testhdf5> -x heap -x file -x select)
-  SET_TESTS_PROPERTIES(testhdf5-base PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
-  SET_TESTS_PROPERTIES(testhdf5-base PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
-  ADD_TEST (NAME testhdf5-heap COMMAND $<TARGET_FILE:testhdf5> -o heap)
-  SET_TESTS_PROPERTIES(testhdf5-heap PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
-  SET_TESTS_PROPERTIES(testhdf5-heap PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
-  ADD_TEST (NAME testhdf5-file COMMAND $<TARGET_FILE:testhdf5> -o file)
-  SET_TESTS_PROPERTIES(testhdf5-file PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
-  SET_TESTS_PROPERTIES(testhdf5-file PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
-  ADD_TEST (NAME testhdf5-select COMMAND $<TARGET_FILE:testhdf5> -o select)
-  SET_TESTS_PROPERTIES(testhdf5-select PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
-  SET_TESTS_PROPERTIES(testhdf5-select PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
+  add_test (NAME testhdf5-base COMMAND $<TARGET_FILE:testhdf5> -x heap -x file -x select)
+  set_tests_properties (testhdf5-base PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+  set_tests_properties (testhdf5-base PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
+  add_test (NAME testhdf5-heap COMMAND $<TARGET_FILE:testhdf5> -o heap)
+  set_tests_properties (testhdf5-heap PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+  set_tests_properties (testhdf5-heap PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
+  add_test (NAME testhdf5-file COMMAND $<TARGET_FILE:testhdf5> -o file)
+  set_tests_properties (testhdf5-file PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+  set_tests_properties (testhdf5-file PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
+  add_test (NAME testhdf5-select COMMAND $<TARGET_FILE:testhdf5> -o select)
+  set_tests_properties (testhdf5-select PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+  set_tests_properties (testhdf5-select PROPERTIES ENVIRONMENT HDF5_ALARM_SECONDS=3600)
 else (HDF5_ENABLE_USING_MEMCHECKER)
-  ADD_TEST (NAME testhdf5 COMMAND $<TARGET_FILE:testhdf5>)
-  SET_TESTS_PROPERTIES(testhdf5 PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+  add_test (NAME testhdf5 COMMAND $<TARGET_FILE:testhdf5>)
+  set_tests_properties (testhdf5 PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
 endif (HDF5_ENABLE_USING_MEMCHECKER)
   
 ##############################################################################
@@ -185,7 +185,7 @@ endif (HDF5_ENABLE_USING_MEMCHECKER)
 ##############################################################################
 
 # Remove any output file left over from previous test run
-ADD_TEST (
+add_test (
     NAME h5test-clear-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
@@ -249,11 +249,11 @@ ADD_TEST (
 )
 
 foreach (test ${H5_TESTS})
-  ADD_TEST (NAME ${test} COMMAND $<TARGET_FILE:${test}>)
-  SET_TESTS_PROPERTIES(${test} PROPERTIES DEPENDS h5test-clear-objects)
+  add_test (NAME ${test} COMMAND $<TARGET_FILE:${test}>)
+  set_tests_properties (${test} PROPERTIES DEPENDS h5test-clear-objects)
 endforeach (test ${H5_TESTS})
 
-SET_TESTS_PROPERTIES(flush2 PROPERTIES DEPENDS flush1)
+set_tests_properties (flush2 PROPERTIES DEPENDS flush1)
 
 ##############################################################################
 ##############################################################################
@@ -262,38 +262,38 @@ SET_TESTS_PROPERTIES(flush2 PROPERTIES DEPENDS flush1)
 ##############################################################################
 
 #-- Adding test for cache
-ADD_TEST (
+add_test (
     NAME h5test-clear-cache-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         cache_test.h5
 )
-ADD_TEST (NAME cache COMMAND $<TARGET_FILE:cache>)
-SET_TESTS_PROPERTIES(cache PROPERTIES DEPENDS h5test-clear-cache-objects)
+add_test (NAME cache COMMAND $<TARGET_FILE:cache>)
+set_tests_properties (cache PROPERTIES DEPENDS h5test-clear-cache-objects)
 
 #-- Adding test for cache_api
-ADD_TEST (
+add_test (
     NAME h5test-clear-cache_api-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         cache_api_test.h5
 )
-ADD_TEST (NAME cache_api COMMAND $<TARGET_FILE:cache_api>)
-SET_TESTS_PROPERTIES(cache_api PROPERTIES DEPENDS h5test-clear-cache_api-objects)
+add_test (NAME cache_api COMMAND $<TARGET_FILE:cache_api>)
+set_tests_properties (cache_api PROPERTIES DEPENDS h5test-clear-cache_api-objects)
 
 #-- Adding test for cache_tagging
-ADD_TEST (
+add_test (
     NAME h5test-clear-cache_tagging-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         tagging_test.h5
         tagging_ext_test.h5
 )
-ADD_TEST (NAME cache_tagging COMMAND $<TARGET_FILE:cache_tagging>)
-SET_TESTS_PROPERTIES(cache_tagging PROPERTIES DEPENDS h5test-clear-cache_tagging-objects)
+add_test (NAME cache_tagging COMMAND $<TARGET_FILE:cache_tagging>)
+set_tests_properties (cache_tagging PROPERTIES DEPENDS h5test-clear-cache_tagging-objects)
 
 #-- Adding test for ttsafe
-ADD_TEST (
+add_test (
     NAME h5test-clear-ttsafe-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
@@ -302,19 +302,19 @@ ADD_TEST (
         ttsafe_cancel.h5
         ttsafe_acreate.h5
 )
-ADD_TEST (NAME ttsafe COMMAND $<TARGET_FILE:ttsafe>)
-SET_TESTS_PROPERTIES(ttsafe PROPERTIES DEPENDS h5test-clear-ttsafe-objects)
+add_test (NAME ttsafe COMMAND $<TARGET_FILE:ttsafe>)
+set_tests_properties (ttsafe PROPERTIES DEPENDS h5test-clear-ttsafe-objects)
 
 #-- Adding test for err_compat
 if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
-  ADD_TEST (
+  add_test (
       NAME h5test-clear-err_compat-objects
       COMMAND    ${CMAKE_COMMAND}
           -E remove 
           err_compat.txt
           err_compat.txt.err
   )
-  ADD_TEST (NAME err_compat COMMAND "${CMAKE_COMMAND}"
+  add_test (NAME err_compat COMMAND "${CMAKE_COMMAND}"
       -D "TEST_PROGRAM=$<TARGET_FILE:err_compat>"
       -D "TEST_ARGS:STRING="
       -D "TEST_EXPECT=0"
@@ -324,18 +324,18 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
       -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
       -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
   )
-  SET_TESTS_PROPERTIES(err_compat PROPERTIES DEPENDS h5test-clear-err_compat-objects)
+  set_tests_properties (err_compat PROPERTIES DEPENDS h5test-clear-err_compat-objects)
 endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
 
 #-- Adding test for error_test
-ADD_TEST (
+add_test (
     NAME h5test-clear-error_test-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove 
         error_test.txt
         error_test.txt.err
 )
-ADD_TEST (NAME error_test COMMAND "${CMAKE_COMMAND}"
+add_test (NAME error_test COMMAND "${CMAKE_COMMAND}"
     -D "TEST_PROGRAM=$<TARGET_FILE:error_test>"
     -D "TEST_ARGS:STRING="
     -D "TEST_EXPECT=0"
@@ -345,11 +345,11 @@ ADD_TEST (NAME error_test COMMAND "${CMAKE_COMMAND}"
     -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
     -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
 )
-SET_TESTS_PROPERTIES(error_test PROPERTIES DEPENDS h5test-clear-error_test-objects)
-SET_TESTS_PROPERTIES (error_test PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PRELOAD=::")
+set_tests_properties (error_test PROPERTIES DEPENDS h5test-clear-error_test-objects)
+set_tests_properties (error_test PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PRELOAD=::")
 
 #-- Adding test for links_env
-ADD_TEST (
+add_test (
     NAME h5test-clear-links_env-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove
@@ -359,7 +359,7 @@ ADD_TEST (
         extlinks_env1.h5
         tmp/extlinks_env1.h5
 )
-ADD_TEST (NAME links_env COMMAND "${CMAKE_COMMAND}"
+add_test (NAME links_env COMMAND "${CMAKE_COMMAND}"
     -D "TEST_PROGRAM=$<TARGET_FILE:links_env>"
     -D "TEST_ARGS:STRING="
     -D "TEST_ENV_VAR:STRING=HDF5_EXT_PREFIX"
@@ -370,10 +370,10 @@ ADD_TEST (NAME links_env COMMAND "${CMAKE_COMMAND}"
     -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
     -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
 )
-SET_TESTS_PROPERTIES(links_env PROPERTIES DEPENDS h5test-clear-links_env-objects)
+set_tests_properties (links_env PROPERTIES DEPENDS h5test-clear-links_env-objects)
 
 #-- Adding test for libinfo
-ADD_TEST (NAME testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FILE:${HDF5_LIB_TARGET}>" -P "${GREP_RUNNER}")
+add_test (NAME testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FILE:${HDF5_LIB_TARGET}>" -P "${GREP_RUNNER}")
 
 ##############################################################################
 ###    P L U G I N  T E S T S
@@ -381,16 +381,16 @@ ADD_TEST (NAME testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FI
 if (BUILD_SHARED_LIBS)
 
   if (WIN32 AND NOT CYGWIN)
-    SET(CMAKE_SEP "\;")
+    set (CMAKE_SEP "\;")
   else (WIN32 AND NOT CYGWIN)
-    SET(CMAKE_SEP ":")
-  ENDIF(WIN32 AND NOT CYGWIN)
+    set (CMAKE_SEP ":")
+  endif (WIN32 AND NOT CYGWIN)
 
-  ADD_TEST (NAME H5PLUGIN-plugin COMMAND $<TARGET_FILE:plugin>)
-  SET_TESTS_PROPERTIES (H5PLUGIN-plugin PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir1${CMAKE_SEP}${CMAKE_BINARY_DIR}/testdir2")
+  add_test (NAME H5PLUGIN-plugin COMMAND $<TARGET_FILE:plugin>)
+  set_tests_properties (H5PLUGIN-plugin PROPERTIES ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir1${CMAKE_SEP}${CMAKE_BINARY_DIR}/testdir2")
 else (BUILD_SHARED_LIBS)
   message (STATUS " **** Plugins libraries must be built as shared libraries **** ")
-  ADD_TEST (
+  add_test (
       NAME H5PLUGIN-SKIPPED
       COMMAND ${CMAKE_COMMAND} -E echo "SKIP H5PLUGIN TESTING"
   )
@@ -475,7 +475,7 @@ if (HDF5_TEST_VFD)
 
   MACRO (ADD_VFD_TEST vfdname resultcode)
     foreach (test ${H5_VFD_TESTS})
-      ADD_TEST (
+      add_test (
         NAME VFD-${vfdname}-${test} 
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
@@ -488,7 +488,7 @@ if (HDF5_TEST_VFD)
       )
     endforeach (test ${H5_VFD_TESTS})
     if (HDF5_TEST_FHEAP_VFD)
-      ADD_TEST (
+      add_test (
         NAME VFD-${vfdname}-fheap 
         COMMAND "${CMAKE_COMMAND}"
             -D "TEST_PROGRAM=$<TARGET_FILE:fheap>"