HDFFV-11012 fix fortran include properties

4 files changed, 48 insertions, 6 deletions

diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 0ec14ab..b380340 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -267,7 +267,7 @@ if (NOT ONLY_SHARED_LIBS)
       PRIVATE
           "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
   )
   target_compile_definitions(${HDF5_F90_LIB_TARGET}
       PRIVATE
@@ -307,7 +307,7 @@ if (BUILD_SHARED_LIBS)
       PRIVATE
           "${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
   )
   target_compile_definitions(${HDF5_F90_LIBSH_TARGET}
       PUBLIC
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 3c46c9e..a3cc552 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -132,7 +132,7 @@ if (NOT BUILD_SHARED_LIBS)
       PRIVATE
           "${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
   )
   target_compile_definitions(${HDF5_F90_TEST_LIB_TARGET}
       PRIVATE
@@ -165,7 +165,7 @@ else ()
       PRIVATE
           "${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
   )
   target_compile_definitions(${HDF5_F90_TEST_LIBSH_TARGET}
       PUBLIC
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index e532fff..91ec669 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -164,7 +164,7 @@ if (NOT ONLY_SHARED_LIBS)
       PRIVATE
           "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
   )
   target_compile_definitions(${HDF5_HL_F90_LIB_TARGET}
       PUBLIC
@@ -201,7 +201,7 @@ if (BUILD_SHARED_LIBS)
       PRIVATE
           "${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
       INTERFACE
-          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+          "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
   )
   target_compile_definitions(${HDF5_HL_F90_LIBSH_TARGET}
       PUBLIC
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index fd10dbd..6e87429 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -45,6 +45,13 @@ New Features
 
     Configuration:
     -------------
+    - Fixed CMake include properties for Fortran libraries
+
+      Corrected the library properties for Fortran to use the
+      correct path for the Fortran module files.
+
+      (ADB - 2020/02/04, HDFFV-11012)
+
     - Added common warnings files for gnu and intel
 
       Added warnings files to use one common set of flags
@@ -169,6 +176,41 @@ New Features
           - set the ENV variable HDF5_ROS3_TEST_BUCKET_URL to the s3 url for the
                 s3 bucket containing the HDF5 files to be accessed.
 
+
+    Java Library:
+    ----------------
+    - Added ability to test java library with VOLs.
+
+      Created new CMake script that combines the java and vol test scripts.
+
+      (ADB - 2020/02/03, HDFFV-10996)
+
+    - Tests fail for non-English locale.
+
+      In the JUnit tests with a non-English locale, only the part before
+      the decimal comma is replaced by XXXX and this leads to a comparison
+      error. Changed the regex for the Time substitution.
+
+      (ADB - 2020/01/09, HDFFV-10995)
+
+
+    Tools:
+    ------
+    - h5diff was updated to use the new reference APIs.
+
+      h5diff uses the new reference APIs to compare references.
+      Attribute references can also be compared.
+
+      (ADB - 2019/12/19, HDFFV-10980)
+
+    - h5dump and h5ls were updated to use the new reference APIs.
+
+      The tools library now use the new reference APIs to inspect a
+      file. Also the DDL spec was updated to reflect the format
+      changes produced with the new APIs. The export API and support
+      functions in the JNI were updated to match.
+
+
     Other improvements and changes:
 
     - Hyperslab selection code was reworked to improve performance, getting more