HDFFV-10845 fix configure check and PATHs

2025-03-19 16:50:46 +08:00 · 2019-07-12 15:42:49 -05:00 · 2019-07-12 15:42:49 -05:00 · 7ba562a820
commit 7ba562a820
parent d586a457b2
23 changed files with 37 additions and 44 deletions
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@ -192,7 +192,7 @@ HDF_README_PROPERTIES(HDF5_BUILD_FORTRAN)
 #-----------------------------------------------------------------------------
 # Configure the COPYING.txt file for the windows binary package
 #-----------------------------------------------------------------------------
-if (WIN32)
+if (WIN32 OR MINGW)
  configure_file (${HDF5_SOURCE_DIR}/COPYING ${HDF5_BINARY_DIR}/COPYING.txt @ONLY)
 endif ()

@ -212,7 +212,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
        ${HDF5_SOURCE_DIR}/release_docs/COPYING
        ${HDF5_SOURCE_DIR}/release_docs/RELEASE.txt
    )
-    if (WIN32)
+    if (WIN32 OR MINGW)
      set (release_files
          ${release_files}
          ${HDF5_SOURCE_DIR}/release_docs/USING_HDF5_VS.txt
@ -226,7 +226,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
          ${HDF5_SOURCE_DIR}/release_docs/HISTORY-1_8.txt
          ${HDF5_SOURCE_DIR}/release_docs/INSTALL
      )
-      if (WIN32)
+      if (WIN32 OR MINGW)
        set (release_files
            ${release_files}
            ${HDF5_SOURCE_DIR}/release_docs/INSTALL_Windows.txt
@ -294,7 +294,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
  set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.bmp")

  set (CPACK_GENERATOR "TGZ")
-  if (WIN32)
+  if (WIN32 OR MINGW)
    set (CPACK_GENERATOR "ZIP")

    if (NSIS_EXECUTABLE)
@ -459,7 +459,7 @@ The HDF5 data model, file format, API, library, and tools are open and distribut
  if (HDF5_PACKAGE_EXTLIBS)
    if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
      if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
-        if (WIN32)
+        if (WIN32 OR MINGW)
          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;ALL;/")
        else ()
          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;libraries;/")
@ -468,7 +468,7 @@ The HDF5 data model, file format, API, library, and tools are open and distribut
        endif ()
      endif ()
      if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-        if (WIN32)
+        if (WIN32 OR MINGW)
          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;ALL;/")
        else ()
          set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/")
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -512,7 +512,7 @@ endif ()
 # and we need to call the executable from inside the CMake configuration
 #-----------------------------------------------------------------------------
 set (EXE_EXT "")
-if (WIN32)
+if (WIN32 OR MINGW)
  set (EXE_EXT ".exe")
  add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
  add_definitions (-D_CRT_SECURE_NO_WARNINGS)
@ -688,7 +688,7 @@ endif ()
 option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
 if (HDF5_ENABLE_THREADSAFE)
  # check for unsupported options
-  if (WIN32)
+  if (WIN32 OR MINGW)
    message (STATUS " **** thread-safety option not supported with static library **** ")
    message (STATUS " **** thread-safety option will not be used building static library **** ")
  endif ()
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@ -188,7 +188,7 @@ install (
    COMPONENT cpplibraries
 )

-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
  configure_file (
      ${HDF_RESOURCES_DIR}/libh5cc.in
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@ -72,7 +72,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
  ## Uncompress source if tar or zip file provided
  ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
  else ()
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@ -49,7 +49,7 @@ endif ()

 message (STATUS "COMMAND: ${TEST_TESTER} -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=${LOG_LEVEL} -Djava.library.path=\"${TEST_LIBRARY_DIRECTORY}\" -cp \"${TEST_CLASSPATH}\" ${TEST_ARGS} ${TEST_PROGRAM} ${ARGN}")

-if (WIN32 AND NOT MINGW)
+if (WIN32 OR MINGW)
  set (ENV{PATH} "$ENV{PATH}\\;${TEST_LIBRARY_DIRECTORY}")
 else ()
  set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@ -124,7 +124,7 @@ message (STATUS "COMMAND Error: ${TEST_ERROR}")
 # compare output files to references unless this must be skipped
 if (NOT TEST_SKIP_COMPARE)
  if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-    if (WIN32 AND NOT MINGW)
+    if (WIN32 OR MINGW)
      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
      file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
    endif ()
@ -186,7 +186,7 @@ if (NOT TEST_SKIP_COMPARE)

  # now compare the .err file with the error reference, if supplied
  if (TEST_ERRREF)
-    if (WIN32 AND NOT MINGW)
+    if (WIN32 OR MINGW)
      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
    endif ()
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@ -69,7 +69,7 @@ set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
 if (CTEST_USE_TAR_SOURCE)
  ## Uncompress source if tar file provided
  ## --------------------------
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
  else ()
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@ -90,7 +90,7 @@ endif ()

 set (CTEST_BINARY_NAME "build")
 set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
-if (WIN32)
+if (WIN32 AND NOT MINGW)
  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
 else ()
@ -104,7 +104,7 @@ if (NOT DEFINED HPC)
  if (NOT DEFINED BUILD_GENERATOR)
    message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364")
  endif ()
-  if (WIN32)
+  if (WIN32 AND NOT MINGW)
    set (SITE_OS_NAME "Windows")
    set (SITE_OS_VERSION "WIN7")
    if (BUILD_GENERATOR STREQUAL "VS201764")
@ -212,7 +212,7 @@ set (REPOSITORY_BRANCH "develop")

 ###################################################################

-if (WIN32)
+if (WIN32 AND NOT MINGW)
  set (BINFILEBASE "HDF5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}-win${SITE_OS_BITS}")
  include (${CTEST_SCRIPT_DIRECTORY}\\HDF5options.cmake)
  include (${CTEST_SCRIPT_DIRECTORY}\\CTestScript.cmake)
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@ -74,7 +74,7 @@ if (MINGW)
  set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1)
 endif ()

-if (WIN32)
+if (WIN32 AND NOT MINGW)
  if (NOT UNIX)
    set (WINDOWS 1)
    set (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1")
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@ -191,7 +191,7 @@ CHECK_FORTRAN_FEATURE(iso_c_binding
 # Add debug information (intel Fortran : JB)
 #-----------------------------------------------------------------------------
 if (CMAKE_Fortran_COMPILER MATCHES ifort)
-    if (WIN32)
+    if (WIN32 AND NOT MINGW)
        set (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
        set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
    endif ()
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@ -46,7 +46,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")

 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 AND NOT MINGW)
+  if (WIN32 OR MINGW)
    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
  else ()
    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@ -98,7 +98,7 @@ if (TEST_ERRREF)
  #always compare output file to reference unless this must be skipped
  if (NOT TEST_SKIP_COMPARE)
    if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-      if (WIN32 AND NOT MINGW)
+      if (WIN32 OR MINGW)
        file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
        file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
      endif ()
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@ -38,7 +38,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")

 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 AND NOT MINGW)
+  if (WIN32 OR MINGW)
    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
  else ()
    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
@ -186,7 +186,7 @@ endif ()
 # compare output files to references unless this must be skipped
 if (NOT TEST_SKIP_COMPARE)
  if (EXISTS ${TEST_FOLDER}/${TEST_REFERENCE})
-    if (WIN32 AND NOT MINGW)
+    if (WIN32 OR MINGW)
      file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
      file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
    endif ()
@ -248,7 +248,7 @@ if (NOT TEST_SKIP_COMPARE)

  # now compare the .err file with the error reference, if supplied
  if (TEST_ERRREF)
-    if (WIN32 AND NOT MINGW)
+    if (WIN32 OR MINGW)
      file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
      file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
    endif ()
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@ -494,7 +494,7 @@ install (
    COMPONENT fortlibraries
 )

-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
  set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
  configure_file (
      ${HDF_RESOURCES_DIR}/libh5cc.in
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@ -108,7 +108,7 @@ install (
    COMPONENT hlcpplibraries
 )

-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
  configure_file (
      ${HDF_RESOURCES_DIR}/libh5cc.in
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@ -132,7 +132,7 @@ install (
    COMPONENT hllibraries
 )

-if (NOT WIN32)
+if (NOT WIN32 AND NOT MINGW)
  set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
  configure_file (
      ${HDF_RESOURCES_DIR}/libh5cc.in
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@ -39,7 +39,7 @@ set (HDF_JAVA_SZIP_EXAMPLES
    set (${HDF_JAVA_EXAMPLES} ${HDF_JAVA_EXAMPLES} ${HDF_JAVA_SZIP_EXAMPLES})
  endif (H5_HAVE_FILTER_SZIP)

-if (WIN32)
+if (WIN32 OR MINGW)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@ -24,7 +24,7 @@ set (HDF_JAVA_EXAMPLES
    H5Ex_T_VLString
 )

-if (WIN32)
+if (WIN32 OR MINGW)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@ -13,7 +13,7 @@ set (HDF_JAVA_EXAMPLES
    H5Ex_G_Visit
 )

-if (WIN32)
+if (WIN32 OR MINGW)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@ -13,7 +13,7 @@ set (HDF_JAVA_EXAMPLES
    H5_ReadWrite
 )

-if (WIN32)
+if (WIN32 OR MINGW)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@ -82,7 +82,7 @@ HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/h5ex_g_iterate.orig" "${PROJECT_BINARY_

 add_custom_target(${HDF5_JAVA_TEST_LIB_TARGET}_files ALL COMMENT "Copying files needed by ${HDF5_JAVA_TEST_LIB_TARGET} tests" DEPENDS ${${HDF5_JAVA_TEST_LIB_TARGET}_files_list})

-if (WIN32)
+if (WIN32 OR MINGW)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@ -885,7 +885,7 @@ endif ()
 ###    F I L T E R  P L U G I N  T E S T S
 ##############################################################################
 if (BUILD_SHARED_LIBS)
-  if (WIN32)
+  if (WIN32 OR MINGW)
    set (CMAKE_SEP "\;")
    set (BIN_REL_PATH "../../")
  else ()
@ -982,7 +982,7 @@ endif ()
 ###    V O L  P L U G I N  T E S T S
 ##############################################################################
 if (BUILD_SHARED_LIBS)
-  if (WIN32)
+  if (WIN32 OR MINGW)
    set (CMAKE_SEP "\;")
    set (BIN_REL_PATH "../../")
  else ()
--- a/test/flushrefreshTest.cmake
+++ b/test/flushrefreshTest.cmake
@ -41,7 +41,7 @@ endif ()
 message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")

 if (TEST_LIBRARY_DIRECTORY)
-  if (WIN32 AND NOT MINGW)
+  if (WIN32 OR MINGW)
    set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
  else ()
    set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")
--- a/tools/src/misc/CMakeLists.txt
+++ b/tools/src/misc/CMakeLists.txt
@ -78,13 +78,6 @@ if (BUILD_SHARED_LIBS)
  )
 endif ()

-#-----------------------------------------------------------------------------
-# Generate the h5cc file containing settings needed to compile programs
-#-----------------------------------------------------------------------------
-#if (NOT WIN32)
-#  configure_file (${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5cc.in ${HDF5_BINARY_DIR}/h5cc @ONLY)
-#endif ()
-
 ##############################################################################
 ##############################################################################
 ###           I N S T A L L A T I O N                                      ###
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@ -362,7 +362,7 @@
  endforeach ()

  foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
-    if (WIN32)
+    if (WIN32 OR MINGW)
      file (READ ${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file} TEST_STREAM)
      file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file} "${TEST_STREAM}")
    else ()
@ -388,7 +388,7 @@
  # --------------------------------------------------------------------
  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")

-  if (WIN32)
+  if (WIN32 OR MINGW)
    file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
    file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
  else ()