Merge/update CMake, presets,java and tools (#3393)

1 files changed, 70 insertions, 57 deletions

diff --git a/config/apple b/config/apple
index 3eb65a7..a8a219b 100644
--- a/config/apple
+++ b/config/apple
@@ -21,58 +21,60 @@
 # No support for OS older than darwin 10.X.
 if test "X-" = "X-$CC"; then
     case "$host_os" in
-	darwin10.*)	# Snow Leopard. Use gcc/g++ because clang++ is not available.
-	    CC=gcc
-	    CC_BASENAME=gcc
-	    ;;
-	*)
-	    CC=clang
-	    CC_BASENAME=clang
-
-	    # Production
-	    PROD_CFLAGS="-O3" 
-	    PROD_CPPFLAGS=
-
-	    # Debug
-	    DEBUG_CFLAGS="-g -O0"
-	    DEBUG_CPPFLAGS=
-
-	    # Profile
-	    # Use this for profiling with gprof
-	    # Just "-g" for now. More later.
-	    PROFILE_CFLAGS="-g"
-	    PROFILE_CPPFLAGS=
-	    ;;
+        darwin10.*)	# Snow Leopard. Use gcc/g++ because clang++ is not available.
+            CC=gcc
+            CC_BASENAME=gcc
+            ;;
+        *)
+            if test "X-$enable_parallel" = "X-yes"; then
+                # default to use mpicc which is the defacto MPI compiler name
+                CC=mpicc
+                CC_BASENAME=mpicc
+            else
+                CC=clang
+                CC_BASENAME=clang
+            fi
+
+            # Production
+            PROD_CFLAGS="-O3" 
+            PROD_CPPFLAGS=
+
+            # Debug
+            DEBUG_CFLAGS="-g -O0"
+            DEBUG_CPPFLAGS=
+
+            # Profile
+            # Use this for profiling with gprof
+            # Just "-g" for now. More later.
+            PROFILE_CFLAGS="-g"
+            PROFILE_CPPFLAGS=
+            ;;
     esac
 fi
 
-# Figure out compiler flags
+# Figure out C compiler flags
 . $srcdir/config/gnu-flags
 . $srcdir/config/clang-flags
+. $srcdir/config/intel-flags
+
 # temp patch: if GCC 4.2.1 is used in Lion or Mountain Lion systems, do not
 # use -O option as it causes failures in test/dt_arith.
 case "$host_os" in
     darwin1[12].*)   # lion & mountain lion
-	#echo cc_vendor=$cc_vendor'-'cc_version=$cc_version
-	case "$cc_vendor-$cc_version" in
-	    gcc-4.2.1)
-		# Remove any -O flags
-		#echo PROD_CFLAGS=$PROD_CFLAGS
-		PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O[0-3]*//'`"
-		#echo new PROD_CFLAGS=$PROD_CFLAGS
-		;;
-	esac
-	;;
+        #echo cc_vendor=$cc_vendor'-'cc_version=$cc_version
+        case "$cc_vendor-$cc_version" in
+            gcc-4.2.1)
+                # Remove any -O flags
+                #echo PROD_CFLAGS=$PROD_CFLAGS
+                PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O[0-3]*//'`"
+                #echo new PROD_CFLAGS=$PROD_CFLAGS
+                ;;
+        esac
+        ;;
 esac
- 
-. $srcdir/config/intel-flags
+
 if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
-        clang)
-	    # clang has no fortran compiler. Use gfortran.
-            FC=gfortran
-            FC_BASENAME=gfortran
-            ;;
         gcc*)
             FC=gfortran
             FC_BASENAME=gfortran
@@ -81,15 +83,26 @@ if test "X-" = "X-$FC"; then
             FC=ifort
             FC_BASENAME=ifort
             ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+        clang)
+            # clang has no fortran compiler. Use gfortran.
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
     esac
 fi
 
+# Figure out FORTRAN compiler flags
+. $srcdir/config/gnu-fflags
+. $srcdir/config/intel-fflags
+
+
+# The default C++ compiler is `clang++'.
 if test "X-" = "X-$CXX"; then
     case $CC_BASENAME in
-        clang)
-            CXX=clang++
-            CXX_BASENAME=clang++
-            ;;
         gcc)
             CXX=g++
             CXX_BASENAME=g++
@@ -98,18 +111,21 @@ if test "X-" = "X-$CXX"; then
             CXX=icpc
             CXX_BASENAME=icpc
             ;;
+        mpicc*)
+            FC=mpif90
+            FC_BASENAME=mpif90
+            ;;
+        clang)
+            CXX=clang++
+            CXX_BASENAME=clang++
+            ;;
     esac
 fi
 
-case $CXX_BASENAME in
-    clang++)
-	PROD_CXXFLAGS="-O3"
-	DEBUG_CXXFLAGS="-g -O0"
-	# Use this for profiling with gprof
-	# Just "-g" for now. More later.
-	PROFILE_CXXFLAGS="-g"
-	;;
-esac
+# Figure out C++ compiler flags
+. $srcdir/config/intel-cxxflags # Do this ahead of GNU to avoid icpc being detected as g++
+. $srcdir/config/gnu-cxxflags
+. $srcdir/config/clang-cxxflags
 
 # compiler version strings
 case $CC in
@@ -132,16 +148,15 @@ case $CC in
         echo "No match to get cc_version_info for $CC"
         ;;
 esac
+
 # Figure out Fortran compiler flags and version strings
 case $FC in
     *gfortran*)
-        . $srcdir/config/gnu-fflags
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
             grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'`
         ;;
 
     *ifc*|*ifort*)
-        . $srcdir/config/intel-fflags
         fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\
             sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'`
         ;;
@@ -155,13 +170,11 @@ esac
 # get c++ version info
 case $CXX in
     clang++)
-        . $srcdir/config/clang-cxxflags
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
             grep 'Apple' | sed 's/(.*//'`
         ;;
 
     *g++*)
-        . $srcdir/config/gnu-cxxflags
         cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
             grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'`
         ;;