Update to generalized code base (#65)

HDFGroup · Apr 10, 2023 · eaeadf8 · eaeadf8
1 parent 62d47ce
commit eaeadf8
Show file tree

Hide file tree

Showing 109 changed files with 701 additions and 1,153 deletions.
diff --git a/BLOSC/config/cmake/ConfigureChecks.cmake b/BLOSC/config/cmake/ConfigureChecks.cmake
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
     )
     if (${OTHER_TEST})
       set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
       set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
         set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
         set (LARGEFILE 1)
         set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... yes")
-        endif ()
+        message (VERBOSE "${msg}... yes")
       else ()
         set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-        endif ()
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
               "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
         )
       endif ()
     else ()
       set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-      endif ()
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Test TEST_LFS_WORKS Compile failed\n"
       )

diff --git a/BLOSC/config/cmake/H5PL_Examples.cmake.in b/BLOSC/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.15
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,20 +88,20 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
 if(WIN32)
   set (SITE_OS_NAME "Windows")
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
   set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
   set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 else()
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")

diff --git a/BLOSC/config/cmake/HDFMacros.cmake b/BLOSC/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BLOSC/config/cmake/HDFPluginMacros.cmake b/BLOSC/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")

diff --git a/BLOSC/config/cmake/README.txt.cmake.in b/BLOSC/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@.@H5BLOSC_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================

diff --git a/BLOSC/config/cmake/binex/Using_CMake.txt b/BLOSC/config/cmake/binex/Using_CMake.txt
@@ -27,8 +27,9 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5PL 1.10.x product requires a minimum CMake version
-      of 3.12.
+      web site. The HDF5PL 1.y.x product requires a minimum CMake version
+      of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
+      using VS2022, the minimum version is 3.21.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -38,26 +39,26 @@ I. Preconditions
    3. Set the environment variable HDF5_ROOT to the installed location of
       the config files for HDF5.
          On Windows:
-            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
          On unix:
-            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
+            HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
 
    4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
       the library files for HDFPL.
          On Windows:
-            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
          On unix:
-            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
+            HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    5. Set the runtime path to the installed location of the library (*.so on linux
       and *.dll on Windows) files for HDF5.
       On Windows:
-            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
+            PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
       On linux:
-            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
+            LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
 
    6. Created separate source and build directories.
       (CMake commands are executed in the build directory)

diff --git a/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake b/BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BSHUF/config/cmake/ConfigureChecks.cmake b/BSHUF/config/cmake/ConfigureChecks.cmake
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
     )
     if (${OTHER_TEST})
       set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
     else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
-      endif ()
+      message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
       set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
         set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
         set (LARGEFILE 1)
         set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... yes")
-        endif ()
+        message (VERBOSE "${msg}... yes")
       else ()
         set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-        endif ()
+        message (VERBOSE "${msg}... no")
         file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
               "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
         )
       endif ()
     else ()
       set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-          message (VERBOSE "${msg}... no")
-      endif ()
+      message (VERBOSE "${msg}... no")
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
           "Test TEST_LFS_WORKS Compile failed\n"
       )

diff --git a/BSHUF/config/cmake/H5PL_Examples.cmake.in b/BSHUF/config/cmake/H5PL_Examples.cmake.in
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
 # Execute from a command line:
 #     ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
 ###############################################################################################################
-# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
-#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
+# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
+#                                     then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
 #     ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
 ###############################################################################################################
 
@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
 ##################################################################
 
 if(NOT DEFINED HDF5INSTALLDIR)
-  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
+  set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
 endif()
 if(NOT DEFINED INSTALLDIR)
   set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
-#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
+#  set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
 #endif()
 
 ###############################################################################################################
@@ -101,7 +101,7 @@ if(WIN32)
   set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 else()
-  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/share/")
+  set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
   set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
   set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
   set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")

diff --git a/BSHUF/config/cmake/HDFMacros.cmake b/BSHUF/config/cmake/HDFMacros.cmake
@@ -495,19 +495,16 @@ endmacro ()
 
 macro (ADD_H5_FLAGS h5_flag_var infile)
   file (STRINGS ${infile} TEST_FLAG_STREAM)
-  #message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
   list (LENGTH TEST_FLAG_STREAM len_flag)
   if (len_flag GREATER 0)
     math (EXPR _FP_LEN "${len_flag} - 1")
     foreach (line RANGE 0 ${_FP_LEN})
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
-      #message (TRACE "str_flag=${str_flag}")
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()
     endforeach ()
   endif ()
-  #message (TRACE "h5_flag_var=${${h5_flag_var}}")
 endmacro ()
 
diff --git a/BSHUF/config/cmake/HDFPluginMacros.cmake b/BSHUF/config/cmake/HDFPluginMacros.cmake
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
     set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
     set (CPACK_PACKAGE_VERSION_PATCH "")
     #set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
-    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+    set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
+    set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
     set (CPACK_PACKAGE_RELOCATABLE TRUE)
     set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
     set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
 #    With CPACK_WIX_LICENSE_RTF you can override the license file used by the
 #    WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
 #    format or the .txt -> .rtf conversion does not work as expected.
-      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+      set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
 #   .. variable:: CPACK_WIX_PRODUCT_ICON
 #    The Icon shown next to the program name in Add/Remove programs.
 #      set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")

diff --git a/BSHUF/config/cmake/README.txt.cmake.in b/BSHUF/config/cmake/README.txt.cmake.in
@@ -2,7 +2,7 @@
 ------------------------------------------------------------------------------
 
 This directory contains the binary (release) distribution of
-@H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION_MAJOR@ that was compiled on;
+@H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION_MAJOR@.@H5BSHUF_PACKAGE_VERSION_MINOR@ that was compiled on;
     @BINARY_PLATFORM@.
 
 It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
    be installed into any location.
 On linux, the installer should be executed in the location to install the
    plugin. The plugins will install into the location:
-            <current dir>/HDF_Group/HDF5/1.10/lib/plugin
+            <current dir>/HDF_Group/HDF5/1.@H5BSHUF_PACKAGE_VERSION_MINOR@/lib/plugin
 On Windows, the installer will default to the same location as the hdf5 installer:
-   C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
+   C:/Program Files/HDF_Group/HDF5/1.@H5BSHUF_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
 1. Execute @H5BSHUF_PACKAGE_NAME@-@H5BSHUF_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
 2. Follow prompts
 ===========================================================================