Skip to content

Commit 897599f

Browse files
committed
FindHDF5 lint: variable naming avoid collison
1 parent fe29dbe commit 897599f

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

cmake/Modules/FindHDF5.cmake

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -207,29 +207,29 @@ endif()
207207
find_library(HDF5_Fortran_LIBRARY
208208
NAMES ${_names}
209209
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
210-
PATH_SUFFIXES ${_lsuf}
210+
PATH_SUFFIXES ${hdf5_lsuf}
211211
NAMES_PER_DIR
212212
DOC "HDF5 Fortran API")
213213

214214
find_library(HDF5_Fortran_HL_LIBRARY
215215
NAMES ${_hl_names}
216216
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
217-
PATH_SUFFIXES ${_lsuf}
217+
PATH_SUFFIXES ${hdf5_lsuf}
218218
NAMES_PER_DIR
219219
DOC "HDF5 Fortran HL high-level API")
220220

221221
# not all platforms have this stub
222222
find_library(HDF5_Fortran_HL_stub
223223
NAMES ${_hl_stub_names}
224224
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
225-
PATH_SUFFIXES ${_lsuf}
225+
PATH_SUFFIXES ${hdf5_lsuf}
226226
NAMES_PER_DIR
227227
DOC "Fortran C HL interface, not all HDF5 implementations have/need this")
228228

229229
find_library(HDF5_Fortran_stub
230230
NAMES ${_stub_names}
231231
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
232-
PATH_SUFFIXES ${_lsuf}
232+
PATH_SUFFIXES ${hdf5_lsuf}
233233
NAMES_PER_DIR
234234
DOC "Fortran C interface, not all HDF5 implementations have/need this")
235235

@@ -241,8 +241,8 @@ endif()
241241
find_path(HDF5_Fortran_INCLUDE_DIR
242242
NAMES hdf5.mod
243243
HINTS ${hdf5_inc_dirs} ${pc_hdf5_INCLUDE_DIRS}
244-
PATH_SUFFIXES ${_msuf}
245-
PATHS ${_binpref}
244+
PATH_SUFFIXES ${hdf5_msuf}
245+
PATHS ${hdf5_binpref}
246246
DOC "HDF5 Fortran modules")
247247

248248
if(HDF5_Fortran_LIBRARY AND HDF5_Fortran_HL_LIBRARY AND HDF5_Fortran_INCLUDE_DIR)
@@ -269,14 +269,14 @@ endif()
269269
find_library(HDF5_CXX_LIBRARY
270270
NAMES ${_names}
271271
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
272-
PATH_SUFFIXES ${_lsuf}
272+
PATH_SUFFIXES ${hdf5_lsuf}
273273
NAMES_PER_DIR
274274
DOC "HDF5 C++ API")
275275

276276
find_library(HDF5_CXX_HL_LIBRARY
277277
NAMES ${_hl_names}
278278
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
279-
PATH_SUFFIXES ${_lsuf}
279+
PATH_SUFFIXES ${hdf5_lsuf}
280280
NAMES_PER_DIR
281281
DOC "HDF5 C++ high-level API")
282282

@@ -311,14 +311,14 @@ endif()
311311
find_library(HDF5_C_LIBRARY
312312
NAMES ${_names}
313313
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
314-
PATH_SUFFIXES ${_lsuf}
314+
PATH_SUFFIXES ${hdf5_lsuf}
315315
NAMES_PER_DIR
316316
DOC "HDF5 C library (necessary for all languages)")
317317

318318
find_library(HDF5_C_HL_LIBRARY
319319
NAMES ${_hl_names}
320320
HINTS ${hdf5_lib_dirs} ${pc_hdf5_LIBRARY_DIRS} ${pc_hdf5_LIBDIR}
321-
PATH_SUFFIXES ${_lsuf}
321+
PATH_SUFFIXES ${hdf5_lsuf}
322322
NAMES_PER_DIR
323323
DOC "HDF5 C high level interface")
324324

@@ -351,7 +351,7 @@ endif()
351351
find_program(HDF5_Fortran_COMPILER_EXECUTABLE
352352
NAMES ${wrapper_names}
353353
HINTS ENV HOMEBREW_PREFIX
354-
PATHS ${_binpref}
354+
PATHS ${hdf5_binpref}
355355
PATH_SUFFIXES ${hdf5_binsuf}
356356
)
357357

@@ -388,7 +388,7 @@ set(inc_dirs)
388388
find_program(HDF5_CXX_COMPILER_EXECUTABLE
389389
NAMES h5c++ h5c++-64
390390
HINTS ENV HOMEBREW_PREFIX
391-
PATHS ${_binpref}
391+
PATHS ${hdf5_binpref}
392392
PATH_SUFFIXES ${hdf5_binsuf}
393393
)
394394

@@ -424,7 +424,7 @@ endif()
424424
find_program(HDF5_C_COMPILER_EXECUTABLE
425425
NAMES ${wrapper_names}
426426
HINTS ENV HOMEBREW_PREFIX
427-
PATHS ${_binpref}
427+
PATHS ${hdf5_binpref}
428428
PATH_SUFFIXES ${hdf5_binsuf}
429429
)
430430

@@ -582,22 +582,25 @@ if(NOT HDF5_ROOT AND NOT HDF5_FOUND)
582582
endif()
583583
endif()
584584

585-
set(_lsuf hdf5)
585+
set(hdf5_lsuf hdf5)
586586
if(NOT parallel IN_LIST HDF5_FIND_COMPONENTS)
587-
list(PREPEND _lsuf hdf5/serial)
587+
list(PREPEND hdf5_lsuf hdf5/serial)
588588
endif()
589589

590590
set(_psuf static)
591591

592-
set(_msuf static)
592+
set(hdf5_msuf static)
593593
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
594-
list(APPEND _msuf gfortran/modules)
594+
list(APPEND hdf5_msuf gfortran/modules)
595595
if(NOT HDF5_ROOT AND parallel IN_LIST HDF5_FIND_COMPONENTS)
596-
list(PREPEND _msuf gfortran/modules/openmpi gfortran/modules/mpich)
596+
list(PREPEND hdf5_msuf gfortran/modules/openmpi gfortran/modules/mpich)
597597
endif()
598598
endif()
599599

600-
set(_binpref /usr/lib64)
600+
set(hdf5_binpref)
601+
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
602+
set(hdf5_binpref /usr/lib64)
603+
endif()
601604

602605
set(hdf5_binsuf bin)
603606
if(NOT HDF5_ROOT AND parallel IN_LIST HDF5_FIND_COMPONENTS)

0 commit comments

Comments
 (0)