Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop

2 files changed, 65 insertions, 8 deletions

diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index f2e03d7..54e408b 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -74,14 +74,14 @@ macro (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
   HDF_IMPORT_SET_LIB_OPTIONS (jpeg-static "jpeg" STATIC "")
   add_dependencies (JPEG jpeg-static)
   set (JPEG_STATIC_LIBRARY "jpeg-static")
-  set (JPEG_LIBRARIES ${JPEG_static_LIBRARY})
+  set (JPEG_LIBRARIES ${JPEG_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target jpeg-shared
     add_library(jpeg-shared SHARED IMPORTED)
     HDF_IMPORT_SET_LIB_OPTIONS (jpeg-shared "jpeg" SHARED "")
     add_dependencies (JPEG jpeg-shared)
     set (JPEG_SHARED_LIBRARY "jpeg-shared")
-    set (JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_shared_LIBRARY})
+    set (JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_SHARED_LIBRARY})
   endif ()
 
   set (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
@@ -167,14 +167,14 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
   HDF_IMPORT_SET_LIB_OPTIONS (szip-static "szip" STATIC "")
   add_dependencies (SZIP szip-static)
   set (SZIP_STATIC_LIBRARY "szip-static")
-  set (SZIP_LIBRARIES ${SZIP_static_LIBRARY})
+  set (SZIP_LIBRARIES ${SZIP_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target szip-shared
     add_library(szip-shared SHARED IMPORTED)
     HDF_IMPORT_SET_LIB_OPTIONS (szip-shared "szip" SHARED "")
     add_dependencies (SZIP szip-shared)
     set (SZIP_SHARED_LIBRARY "szip-shared")
-    set (SZIP_LIBRARIES ${SZIP_LIBRARIES} ${SZIP_shared_LIBRARY})
+    set (SZIP_LIBRARIES ${SZIP_LIBRARIES} ${SZIP_SHARED_LIBRARY})
   endif ()
 
   set (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
@@ -262,7 +262,7 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
   HDF_IMPORT_SET_LIB_OPTIONS (zlib-static ${ZLIB_LIB_NAME} STATIC "")
   add_dependencies (ZLIB zlib-static)
   set (ZLIB_STATIC_LIBRARY "zlib-static")
-  set (ZLIB_LIBRARIES ${ZLIB_static_LIBRARY})
+  set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
   if (BUILD_SHARED_LIBS)
     # Create imported target zlib-shared
     add_library(zlib-shared SHARED IMPORTED)
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 1785e0e..39225e7 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -84,7 +84,20 @@ else
             $RM $tmpfile
             fc_version_info=`$FC -V | grep Absoft`
             ;;
-
+         # The NAG compiler
+	 nagfor*|nagftn*)
+            RM='rm -f'
+            tmpfile=/tmp/cmpver.$$
+            $FC -V >& $tmpfile
+            if test -s "$tmpfile"; then
+                if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+                    FC_BASENAME=nagfor
+                fi
+            fi
+            fc_version_info=`grep "NAG Fortran" $tmpfile`
+            echo "compiler '$FC' is $fc_version_info"
+            $RM $tmpfile
+	    ;;
          *)
             ;;
     esac
@@ -108,10 +121,10 @@ case $FC_BASENAME in
     #
     f95)
         # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS" 
+        H5_CFLAGS="$H5_CFLAGS"
 
         F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
+# We force compiler to use upper case for external names
 # (just in case since this should be a default EIP)
         H5_FCFLAGS="$H5_FCFLAGS"
         FSEARCH_DIRS=""
@@ -136,6 +149,37 @@ case $FC_BASENAME in
 
         f9x_flags_set=yes
         ;;
+#
+#   NAG compiler
+#
+    nagfor)
+
+        F9XSUFFIXFLAG=""
+# We force compiler to use upper case for external names
+# (just in case since this should be a default EIP)
+        H5_FCFLAGS="$H5_FCFLAGS"
+        FSEARCH_DIRS=""
+
+        # Production
+        PROD_FCFLAGS=
+
+        # Debug
+        DEBUG_FCFLAGS="-C"
+
+        # Symbols
+        SYMBOLS_FCFLAGS="-g"
+        NO_SYMBOLS_FCFLAGS="-s"
+
+        # Profiling
+        PROFILE_FCFLAGS="-pg"
+
+        # Optimization
+        HIGH_OPT_FCFLAGS="-O"
+        DEBUG_OPT_FCFLAGS="-O0"
+        NO_OPT_FCFLAGS="-O0"
+
+        f9x_flags_set=yes
+        ;;
 
 esac  
 
@@ -230,6 +274,19 @@ case $FC in
     *pgf90*)
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'pgf90'`
         ;;
+    *nagfor*|*nagftn*)
+        RM='rm -f'
+        tmpfile=/tmp/cmpver.$$
+        $FC -V >& $tmpfile
+        if test -s "$tmpfile"; then
+           if( grep -s 'NAG Fortran' $tmpfile > /dev/null) then
+               FC_BASENAME=nagfor
+           fi
+        fi
+        fc_version_info=`grep "NAG Fortran" $tmpfile`
+        $RM $tmpfile
+        echo "compiler '$FC' is $fc_version_info"
+	;;
 
      *)
         echo "No match to get fc_version_info for $FC"