From ac8a1f02ab5cb260f23acbe865090033a0183303 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 16 Jul 2019 16:12:15 -0500
Subject: Add missing target root path, check other export macro

---
 config/cmake/CTestScript.cmake     |  5 +++++
 config/toolchain/mingw64.cmake     |  2 +-
 tools/test/h5dump/CMakeTests.cmake | 46 +++++++++++++++++++++-----------------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index a5527c3..e819e58 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -101,6 +101,11 @@ endif ()
 include (ProcessorCount)
 ProcessorCount (N)
 if (NOT N EQUAL 0)
+  if (MAX_PROC_COUNT)
+    if (N GREATER MAX_PROC_COUNT)
+      set (N ${MAX_PROC_COUNT})
+    endif ()
+  endif ()
   if (NOT WIN32)
     set (CTEST_BUILD_FLAGS -j${N})
   endif ()
diff --git a/config/toolchain/mingw64.cmake b/config/toolchain/mingw64.cmake
index ad0fb85..721c39a 100644
--- a/config/toolchain/mingw64.cmake
+++ b/config/toolchain/mingw64.cmake
@@ -3,7 +3,7 @@ set (CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
 set (CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
 set (CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
 set (CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
-set (CMAKE_FIND_ROOT_PATH )
+set (CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index e8e9d07..7a3fdd6 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -610,20 +610,22 @@
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
-      add_test (
-          NAME H5DUMP-${resultfile}-output-cmp
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${resultfile}.txt ${resultfile}.exp
-      )
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
-      add_test (
-          NAME H5DUMP-${resultfile}-output-cmp-ddl
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${ddlfile}.txt ${ddlfile}.exp
-      )
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DEPENDS H5DUMP-${resultfile}-output-cmp)
+      if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+        add_test (
+            NAME H5DUMP-${resultfile}-output-cmp
+            COMMAND ${CMAKE_COMMAND}
+                  -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+        )
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES DEPENDS H5DUMP-${resultfile})
+        add_test (
+            NAME H5DUMP-${resultfile}-output-cmp-ddl
+            COMMAND ${CMAKE_COMMAND}
+                  -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
+        )
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES DEPENDS H5DUMP-${resultfile}-output-cmp)
+      endif ()
     endif ()
   endmacro ()
 
@@ -641,13 +643,15 @@
       )
       set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       set_tests_properties (H5DUMP-output-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile}-clear-objects)
-      add_test (
-          NAME H5DUMP-output-cmp-${resultfile}
-          COMMAND ${CMAKE_COMMAND}
-                -E compare_files ${resultfile}.txt ${resultfile}.exp
-      )
-      set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile})
+      if(NOT CMAKE_VERSION VERSION_LESS "3.14.0")
+        add_test (
+            NAME H5DUMP-output-cmp-${resultfile}
+            COMMAND ${CMAKE_COMMAND}
+                  -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+        )
+        set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
+        set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES DEPENDS H5DUMP-output-${resultfile})
+      endif ()
     endif ()
   endmacro ()
 
-- 
cgit v0.12