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/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -24,7 +24,7 @@ set (HDF_JAVA_EXAMPLES
    H5Ex_T_VLString
 )

-if (WIN32 OR MINGW)
+if (WIN32)
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
 else ()
  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
--- a/java/examples/datatypes/Makefile.am
+++ b/java/examples/datatypes/Makefile.am
@@ -1,6 +1,5 @@
 #
 # Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
 # All rights reserved.
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including