Brings many CMake changes from develop

2021-04-07 19:07:31 -07:00
parent ce39d7501c
commit 94ecd14100
104 changed files with 2211 additions and 566 deletions
--- 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 OR MINGW)
+if (WIN32)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")