Skip to content

Commit f096921

Browse files
authored
Fix typo in cmake find netCDF causing failure on blank responses (#2135)
TYPE: bug fix KEYWORDS: netcdf, cmake SOURCE: internal DESCRIPTION OF CHANGES: Problem: Certain versions of netCDF with particular configurations return a blank when queried with `nc-config`. To prevent a null argument expansion in CMake we should check for variable emptiness and if empty assume the queried feature is not present. There is a typo copied from the FindnetCDF-Fortran.cmake module causing this check to never get exercised leading to failed configuration due to syntax errors. Solution: Correct the typo to reference the netCDF variables rather than the netCDF-Fortran ones. TESTS CONDUCTED: 1. Tested against netCDF 4.7.2 without szlib (`--has-szlib -> `) RELEASE NOTE: Bug fix in CMake FindnetCDF.cmake for empty --has-* nc-config fields
1 parent 5dd2c19 commit f096921

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/FindnetCDF.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ else()
6666

6767
foreach( NC_QUERY ${netCDF_QUERY_YES_OPTIONS} )
6868
execute_process( COMMAND ${NETCDF_PROGRAM} --has-${NC_QUERY} OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE netCDF_${NC_QUERY}_LOWERCASE )
69-
if ( NOT "${netCDF-Fortran_${NF_QUERY}_LOWERCASE}" )
69+
if ( NOT "${netCDF_${NC_QUERY}_LOWERCASE}" )
7070
# might be empty
71-
set( netCDF-Fortran_${NF_QUERY}_LOWERCASE no )
71+
set( netCDF_${NC_QUERY}_LOWERCASE no )
7272
endif()
7373
string( TOUPPER ${NC_QUERY} NC_QUERY_UPPERCASE )
7474
string( TOUPPER ${netCDF_${NC_QUERY}_LOWERCASE} NC_ANSWER_UPPERCASE )

0 commit comments

Comments
 (0)