Merge remote-tracking branch 'Unidata/main'

This commit is contained in:
Dennis Heimbigner 2022-05-27 15:15:10 -06:00
commit 84247115d5
2 changed files with 5 additions and 2 deletions

View File

@ -116,14 +116,14 @@ IF(USE_HDF5)
# builds:
# Make sure that HDF5_C_LIBRARY appears *after*
# HDF5_HL_LIBRARY.
SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
ELSE() # Windows CMake defines HDF5_LIBRARIES.
SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
ENDIF()
ENDIF()
IF(FOUND_CURL)
SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY})
SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARIES})
ENDIF()
IF(USE_HDF4)

View File

@ -60,6 +60,9 @@ THIS SOFTWARE.
*/
#include "config.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h> /* open() */