mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-11 16:40:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Corrected an issue when compiling with HDF4 and CMake.

Browse Source
This commit is contained in:
Ward Fisher 2013-10-08 12:59:33 -06:00
parent 18dca3eb66
commit 82f835edbb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -443,10 +443,14 @@ OPTION (ENABLE_HDF4 "Build netCDF-4 with HDF5 read capability (HDF4, HDF5 and Zl
IF (ENABLE_HDF4)
SET(USE_HDF4 ON)
# Check for include files, libraries.
CHECK_INCLUDE_FILE("mfhdf.h" HAVE_MFHDF_H)
IF(NOT HAVE_MFHDF_H)
FIND_PATH(MFHDF_H_INCLUDE_DIR mfhdf.h)
IF(NOT MFHDF_H_INCLUDE_DIR)
MESSAGE(FATAL_ERROR "HDF4 Support specified, cannot find file mfhdf.h")
ENDIF(NOT HAVE_MFHDF_H)
ELSE()
SET(HAVE_MFHDF_H ON CACHE BOOL "")
INCLUDE_DIRECTORIES(${MFHDF_H_INCLUDE_DIR})
ENDIF()
FIND_LIBRARY(HDF4_DF_LIB NAMES df libdf)
IF(NOT HDF4_DF_LIB)

4
RELEASE_NOTES.md
View File

@ -10,7 +10,9 @@ information, where '[NCF-XXX]' refers to https://www.unidata.ucar.edu/jira/brows
### 4.3.1-rc4 Released TBD
Fix bug introduced by [NCF-267] where octal constants above
* Corrected an issue with CMake-based builds enabling HDF4 support where the HDF4 libraries were in a non-standard location.
* Fix bug introduced by [NCF-267] where octal constants above
'\177' were not recognized as proper octal constants. [NCF-271]
[NCF-271]:https://bugtracking.unidata.ucar.edu/browse/NCF-271