Restore other build methods, add workflows

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/vol-tests"]
+ path = test/vol-tests
+ url = https://github.com/HDFGroup/vol-tests

CMakeLists.txt

@@ -101,8 +101,6 @@ set (HDF5_VOL_REST_TEST_SRC_DIR ${HDF5_VOL_REST_SOURCE_DIR}/test)
 set (HDF5_VOL_REST_EXAMPLES_DIR ${HDF5_VOL_REST_SOURCE_DIR}/examples)
 set (HDF5_DIR_NAME "hdf5")
 set (HDF5_HL_DIR_NAME "hl")
-#set (HDF5_DIR ${HDF5_VOL_REST_SRC_DIR}/${HDF5_DIR_NAME})
-#set (HDF5_BINARY_DIR ${HDF5_VOL_REST_BINARY_DIR}/${HDF5_DIR_NAME})
 
 #-----------------------------------------------------------------------------
 # Find HDF5, cURL and YAJL before building
@@ -111,6 +109,12 @@ if (HDF5_FOUND STREQUAL "")
  set (HDF5_FOUND FALSE)
 endif()
 
+find_package(HDF5 MODULE COMPONENTS C HL)
+
+if (NOT HDF5_FOUND)
+ message(SEND_ERROR "HDF5 not found!")
+endif()
+
 if (HDF5_ENABLE_THREADSAFE AND NOT Threads_FOUND)
  find_package(Threads)
 endif ()
@@ -457,19 +461,11 @@ set (HDF5_VOL_REST_INCLUDE_DIRECTORIES
  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
 
-if (HDF5_FOUND)
- list(APPEND HDF5_VOL_REST_INCLUDE_DIRECTORIES
- ${HDF5_INCLUDE_DIRS}
- ${HDF5_BINARY_DIR}/src
- ${HDF5_SOURCE_DIR}/${HDF5_HL_DIR_NAME}/src
- )
-else ()
- message(SEND_ERROR "HDF5 not found!") 
- #list(APPEND HDF5_VOL_REST_INCLUDE_DIRECTORIES
- #${HDF5_DIR}
- #${HDF5_BINARY_DIR}
- #)
-endif ()
+list(APPEND HDF5_VOL_REST_INCLUDE_DIRECTORIES
+ ${HDF5_INCLUDE_DIRS}
+ ${HDF5_BINARY_DIR}/src
+ ${HDF5_SOURCE_DIR}/${HDF5_HL_DIR_NAME}/src
+)
 
 set(HDF5_VOL_REST_INCLUDE_DIRECTORIES 
  ${HDF5_VOL_REST_INCLUDE_DIRECTORIES}
@@ -577,7 +573,7 @@ include (${HDF5_VOL_REST_RESOURCES_DIR}/HDFCompilerFlags.cmake)
 #-----------------------------------------------------------------------------
 include_directories(${HDF5_INCLUDE_DIRS})
 
-set (HDF5_LIBRARIES_TO_EXPORT
+list (APPEND HDF5_LIBRARIES_TO_EXPORT
  ${HDF5_C_HL_LIBRARIES}
 )
 

autogen.sh

@@ -0,0 +1,204 @@
+#!/bin/sh
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of the HDF5 REST VOL connector. The full copyright
+# notice, including terms governing use, modification, and redistribution,
+# is contained in the COPYING file, which can be found at the root of the
+# source code distribution tree.
+#
+
+# A script to reconfigure autotools for the HDF5 REST VOL connector.
+#
+# IMPORTANT OS X NOTE
+#
+# If you are using OS X, you will probably not have the autotools
+# installed, even if you have the Xcode command-line tools.
+#
+# The easiest way to fix this is to install everything via Homebrew:
+#
+# http://brew.sh/
+#
+# After you install the base packages, install autoconf, automake,
+# and libtool.
+#
+# brew install autoconf
+# brew install automake
+# brew install libtool
+#
+# This only takes a few minutes. Note that libtool and libtoolize will
+# be glibtool and glibtoolize so as not to conflict with Apple's non-gnu
+# tools. This autogen.sh script handles this for you.
+#
+# END IMPORTANT OS X NOTE
+#
+# If you want to use a particular version of the autotools, the paths
+# to each tool can be overridden using the following environment
+# variables:
+#
+# HDF5_ACLOCAL
+# HDF5_AUTOHEADER
+# HDF5_AUTOMAKE
+# HDF5_AUTOCONF
+# HDF5_LIBTOOL
+# HDF5_M4
+#
+# Note that aclocal will attempt to include libtool's share/aclocal
+# directory.
+#
+# This script takes one potential option:
+#
+# -v
+#
+# This emits some extra information, mainly tool versions.
+
+echo
+echo "******************************"
+echo "* REST VOL autogen.sh script *"
+echo "******************************"
+echo
+
+# Default is not verbose output
+verbose=false
+
+optspec=":hv-"
+while getopts "$optspec" optchar; do
+ case "${optchar}" in
+ h)
+ echo "usage: $0 [OPTIONS]"
+ echo
+ echo " -h Print this help message."
+ echo
+ echo " -v Show more verbose output."
+ echo
+ echo " NOTE: Each tool can be set via an environment variable."
+ echo " These are documented inside this autogen.sh script."
+ echo
+ exit 0
+ ;;
+ v)
+ echo "Setting verbosity: high"
+ echo
+ verbose=true
+ ;;
+ *)
+ if [ "$OPTERR" != 1 ] || case $optspec in :*) ;; *) false; esac; then
+ echo "ERROR: non-option argument: '-${OPTARG}'" >&2
+ echo "Quitting"
+ exit 1
+ fi
+ ;;
+ esac
+done
+
+# If paths to autotools are not specified, use whatever the system
+# has installed as the default. We use 'which <tool>' to
+# show exactly what's being used.
+if test -z ${HDF5_AUTOCONF}; then
+ HDF5_AUTOCONF=$(which autoconf)
+fi
+if test -z ${HDF5_AUTOMAKE}; then
+ HDF5_AUTOMAKE=$(which automake)
+fi
+if test -z ${HDF5_AUTOHEADER}; then
+ HDF5_AUTOHEADER=$(which autoheader)
+fi
+if test -z ${HDF5_ACLOCAL}; then
+ HDF5_ACLOCAL=$(which aclocal)
+fi
+if test -z ${HDF5_LIBTOOL}; then
+ case "`uname`" in
+ Darwin*)
+ # libtool on OS-X is non-gnu
+ HDF5_LIBTOOL=$(which glibtool)
+ ;;
+ *)
+ HDF5_LIBTOOL=$(which libtool)
+ ;;
+ esac
+fi
+if test -z ${HDF5_M4}; then
+ HDF5_M4=$(which m4)
+fi
+
+
+# Make sure that these versions of the autotools are in the path
+AUTOCONF_DIR=`dirname ${HDF5_AUTOCONF}`
+LIBTOOL_DIR=`dirname ${HDF5_LIBTOOL}`
+M4_DIR=`dirname ${HDF5_M4}`
+PATH=${AUTOCONF_DIR}:${LIBTOOL_DIR}:${M4_DIR}:$PATH
+
+# Make libtoolize match the specified libtool
+case "`uname`" in
+Darwin*)
+ # On OS X, libtoolize could be named glibtoolize or
+ # libtoolize. Try the former first, then fall back
+ # to the latter if it's not found.
+ HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/glibtoolize"
+ if [ ! -f $HDF5_LIBTOOLIZE ] ; then
+ HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
+ fi
+ ;;
+*)
+ HDF5_LIBTOOLIZE="${LIBTOOL_DIR}/libtoolize"
+ ;;
+esac
+
+# Run autotools in order
+#
+# When available, we use the --force option to ensure all files are
+# updated. This prevents the autotools from re-running to fix dependencies
+# during the 'make' step, which can be a problem if environment variables
+# were set on the command line during autogen invocation.
+
+# LIBTOOLIZE
+libtoolize_cmd="${HDF5_LIBTOOLIZE} --copy --force"
+echo ${libtoolize_cmd}
+if [ "$verbose" = true ] ; then
+ ${HDF5_LIBTOOLIZE} --version
+fi
+${libtoolize_cmd} || exit 1
+echo
+
+# ACLOCAL
+if test -e "${LIBTOOL_DIR}/../share/aclocal" ; then
+ aclocal_include="-I ${LIBTOOL_DIR}/../share/aclocal"
+fi
+aclocal_cmd="${HDF5_ACLOCAL} --force -I m4 ${aclocal_include}"
+echo ${aclocal_cmd}
+if [ "$verbose" = true ] ; then
+ ${HDF5_ACLOCAL} --version
+fi
+${aclocal_cmd} || exit 1
+echo
+
+# AUTOHEADER
+autoheader_cmd="${HDF5_AUTOHEADER} --force"
+echo ${autoheader_cmd}
+if [ "$verbose" = true ] ; then
+ ${HDF5_AUTOHEADER} --version
+fi
+${autoheader_cmd} || exit 1
+echo
+
+# AUTOMAKE
+automake_cmd="${HDF5_AUTOMAKE} --copy --add-missing --force-missing"
+echo ${automake_cmd}
+if [ "$verbose" = true ] ; then
+ ${HDF5_AUTOMAKE} --version
+fi
+${automake_cmd} || exit 1
+echo
+
+# AUTOCONF
+autoconf_cmd="${HDF5_AUTOCONF} --force"
+echo ${autoconf_cmd}
+if [ "$verbose" = true ] ; then
+ ${HDF5_AUTOCONF} --version
+fi
+${autoconf_cmd} || exit 1
+echo
+
+echo
+exit 0