kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindHDF5-fix-misc-issues' 

d5e4516e FindHDF5: Cleanup inconsistent use of HDF5_ROOT
4ece8bdd FindHDF5: Properly fail when required components are not found.
87c1cd9c FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac
This commit is contained in:
Brad King 2016-07-13 09:26:52 -04:00 committed by CMake Topic Stage
parent de1f409844 d5e4516ec2
commit 7a31a2717b
1 changed files with 99 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
Modules/FindHDF5.cmake
View File

@ -117,9 +117,11 @@ if(NOT HDF5_FIND_COMPONENTS)
foreach(__lang IN LISTS __langs) foreach(__lang IN LISTS __langs)
if(__lang MATCHES "^(C|CXX|Fortran)$") if(__lang MATCHES "^(C|CXX|Fortran)$")
list(APPEND HDF5_LANGUAGE_BINDINGS ${__lang}) list(APPEND HDF5_LANGUAGE_BINDINGS ${__lang})
set(HDF5_FIND_REQUIRED_${__lang} True)
endif() endif()
endforeach() endforeach()
set(FIND_HL ON) set(FIND_HL ON)
set(HDF5_FIND_REQUIRED_HL True)
else() else()
# add the extra specified components, ensuring that they are valid. # add the extra specified components, ensuring that they are valid.
set(FIND_HL OFF) set(FIND_HL OFF)
@ -132,6 +134,9 @@ else()
elseif(component STREQUAL "Fortran_HL") # only for compatibility elseif(component STREQUAL "Fortran_HL") # only for compatibility
list(APPEND HDF5_LANGUAGE_BINDINGS Fortran) list(APPEND HDF5_LANGUAGE_BINDINGS Fortran)
set(FIND_HL ON) set(FIND_HL ON)
set(HDF5_FIND_REQUIRED_Fortran_HL False)
set(HDF5_FIND_REQUIRED_Fortran True)
set(HDF5_FIND_REQUIRED_HL True)
else() else()
message(FATAL_ERROR "${component} is not a valid HDF5 component.") message(FATAL_ERROR "${component} is not a valid HDF5 component.")
endif() endif()
@ -144,6 +149,7 @@ else()
endif() endif()
endforeach() endforeach()
endif() endif()
list(REMOVE_ITEM HDF5_FIND_COMPONENTS Fortran_HL) # replaced by Fortran and HL
list(REMOVE_DUPLICATES HDF5_LANGUAGE_BINDINGS) list(REMOVE_DUPLICATES HDF5_LANGUAGE_BINDINGS)
endif() endif()
@ -267,8 +273,21 @@ endfunction()
# return_value argument, the text output is stored to the output variable. # return_value argument, the text output is stored to the output variable.
macro( _HDF5_invoke_compiler language output return_value version) macro( _HDF5_invoke_compiler language output return_value version)
set(${version}) set(${version})
if(HDF5_USE_STATIC_LIBRARIES)
set(lib_type_args -noshlib)
else()
set(lib_type_args -shlib)
endif()
set(scratch_dir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/hdf5)
if("${language}" STREQUAL "C")
set(test_file ${scratch_dir}/cmake_hdf5_test.c)
elseif("${language}" STREQUAL "CXX")
set(test_file ${scratch_dir}/cmake_hdf5_test.cxx)
elseif("${language}" STREQUAL "Fortran")
set(test_file ${scratch_dir}/cmake_hdf5_test.f90)
endif()
exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE} exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE}
ARGS -show ARGS -show ${lib_type_args} ${test_file}
OUTPUT_VARIABLE ${output} OUTPUT_VARIABLE ${output}
RETURN_VALUE ${return_value} RETURN_VALUE ${return_value}
) )
@ -302,48 +321,67 @@ macro( _HDF5_parse_compile_line
libraries_hl) libraries_hl)
# Match the include paths # Match the include paths
string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags set( RE " -I *([^\" ]+|\"[^\"]+\")")
"${${compile_line_var}}" string( REGEX MATCHALL "${RE}" include_path_flags "${${compile_line_var}}")
) foreach( IPATH IN LISTS include_path_flags )
foreach( IPATH ${include_path_flags} ) string( REGEX REPLACE "${RE}" "\\1" IPATH "${IPATH}" )
string( REGEX REPLACE "^-I" "" IPATH ${IPATH} )
string( REPLACE "//" "/" IPATH ${IPATH} )
list( APPEND ${include_paths} ${IPATH} ) list( APPEND ${include_paths} ${IPATH} )
endforeach() endforeach()
# Match the definitions # Match the definitions
string( REGEX MATCHALL "-D[^ ]*" definition_flags "${${compile_line_var}}" ) set( RE " -D([^ ]*)")
foreach( DEF ${definition_flags} ) string( REGEX MATCHALL "${RE}" definition_flags "${${compile_line_var}}" )
foreach( DEF IN LISTS definition_flags )
string( REGEX REPLACE "${RE}" "\\1" DEF "${DEF}" )
list( APPEND ${definitions} ${DEF} ) list( APPEND ${definitions} ${DEF} )
endforeach() endforeach()
# Match the library paths # Match the library paths
string( REGEX MATCHALL "-L([^\" ]+|\"[^\"]+\")" library_path_flags set( RE " -L *([^\" ]+|\"[^\"]+\")")
"${${compile_line_var}}" string( REGEX MATCHALL "${RE}" library_path_flags "${${compile_line_var}}")
) foreach( LPATH IN LISTS library_path_flags )
string( REGEX REPLACE "${RE}" "\\1" LPATH "${LPATH}" )
foreach( LPATH ${library_path_flags} )
string( REGEX REPLACE "^-L" "" LPATH ${LPATH} )
string( REPLACE "//" "/" LPATH ${LPATH} )
list( APPEND ${library_paths} ${LPATH} ) list( APPEND ${library_paths} ${LPATH} )
endforeach() endforeach()
# now search for the library names specified in the compile line (match -l...) # now search for the lib names specified in the compile line (match -l...)
# match only -l's preceded by a space or comma # match only -l's preceded by a space or comma
# this is to exclude directory names like xxx-linux/ set( RE " -l *([^\" ]+|\"[^\"]+\")")
string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags string( REGEX MATCHALL "${RE}" library_name_flags "${${compile_line_var}}")
"${${compile_line_var}}" ) foreach( LNAME IN LISTS library_name_flags )
# strip the -l from all of the library flags and add to the search list string( REGEX REPLACE "${RE}" "\\1" LNAME "${LNAME}" )
foreach( LIB ${library_name_flags} ) if(LNAME MATCHES ".*hl")
string( REGEX REPLACE "^[, ]-l" "" LIB ${LIB} ) list(APPEND ${libraries_hl} ${LNAME})
if(LIB MATCHES ".*_hl")
list(APPEND ${libraries_hl} ${LIB})
else() else()
list(APPEND ${libraries} ${LIB}) list(APPEND ${libraries} ${LNAME})
endif()
endforeach()
# now search for full library paths with no flags
set( RE " ([^\" ]+|\"[^\"]+\")")
string( REGEX MATCHALL "${RE}" library_name_noflags "${${compile_line_var}}")
foreach( LIB IN LISTS library_name_noflags )
string( REGEX REPLACE "${RE}" "\\1" LIB "${LIB}" )
get_filename_component(LIB "${LIB}" ABSOLUTE)
if(NOT EXISTS ${LIB} OR IS_DIRECTORY ${LIB})
continue()
endif()
get_filename_component(LPATH ${LIB} DIRECTORY)
get_filename_component(LNAME ${LIB} NAME_WE)
string( REGEX REPLACE "^lib" "" LNAME ${LNAME} )
list( APPEND ${library_paths} ${LPATH} )
if(LNAME MATCHES ".*hl")
list(APPEND ${libraries_hl} ${LNAME})
else()
list(APPEND ${libraries} ${LNAME})
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
if(NOT HDF5_ROOT)
set(HDF5_ROOT $ENV{HDF5_ROOT})
endif()
# Try to find HDF5 using an installed hdf5-config.cmake # Try to find HDF5 using an installed hdf5-config.cmake
if(NOT HDF5_FOUND AND NOT HDF5_ROOT) if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
find_package(HDF5 QUIET NO_MODULE) find_package(HDF5 QUIET NO_MODULE)
@ -382,6 +420,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
mark_as_advanced(HDF5_${_lang}_LIBRARY) mark_as_advanced(HDF5_${_lang}_LIBRARY)
list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY}) list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY})
set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY}) set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY})
set(HDF5_${_lang}_FOUND True)
endif() endif()
if(FIND_HL) if(FIND_HL)
get_target_property(_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION) get_target_property(_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION)
@ -391,6 +430,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
mark_as_advanced(HDF5_${_lang}_HL_LIBRARY) mark_as_advanced(HDF5_${_lang}_HL_LIBRARY)
list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY}) list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY}) set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
set(HDF5_HL_FOUND True)
endif() endif()
endif() endif()
endforeach() endforeach()
@ -433,13 +473,15 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS) mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS)
mark_as_advanced(HDF5_${__lang}_LIBRARIES) mark_as_advanced(HDF5_${__lang}_LIBRARIES)
mark_as_advanced(HDF5_${__lang}_HL_LIBRARIES) mark_as_advanced(HDF5_${__lang}_HL_LIBRARIES)
set(HDF5_${__lang}_FOUND True)
set(HDF5_HL_FOUND True)
else() else()
set(HDF5_COMPILER_NO_INTERROGATE False) set(HDF5_COMPILER_NO_INTERROGATE False)
# If this language isn't using the wrapper, then try to seed the # If this language isn't using the wrapper, then try to seed the
# search options with the wrapper # search options with the wrapper
find_program(HDF5_${__lang}_COMPILER_EXECUTABLE find_program(HDF5_${__lang}_COMPILER_EXECUTABLE
NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR
HINTS ENV HDF5_ROOT
PATH_SUFFIXES bin Bin PATH_SUFFIXES bin Bin
DOC "HDF5 ${__lang} Wrapper compiler. Used only to detect HDF5 compile flags." DOC "HDF5 ${__lang} Wrapper compiler. Used only to detect HDF5 compile flags."
) )
@ -459,6 +501,14 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
HDF5_${__lang}_HL_LIBRARY_NAMES HDF5_${__lang}_HL_LIBRARY_NAMES
) )
set(HDF5_${__lang}_LIBRARIES) set(HDF5_${__lang}_LIBRARIES)
set(_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
if(HDF5_USE_STATIC_LIBRARIES)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
else()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
foreach(L IN LISTS HDF5_${__lang}_LIBRARY_NAMES) foreach(L IN LISTS HDF5_${__lang}_LIBRARY_NAMES)
find_library(HDF5_${__lang}_LIBRARY_${L} ${L} ${HDF5_${__lang}_LIBRARY_DIRS}) find_library(HDF5_${__lang}_LIBRARY_${L} ${L} ${HDF5_${__lang}_LIBRARY_DIRS})
if(HDF5_${__lang}_LIBRARY_${L}) if(HDF5_${__lang}_LIBRARY_${L})
@ -477,7 +527,11 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
list(APPEND HDF5_${__lang}_HL_LIBRARIES ${L}) list(APPEND HDF5_${__lang}_HL_LIBRARIES ${L})
endif() endif()
endforeach() endforeach()
set(HDF5_HL_FOUND True)
endif() endif()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_HDF5_CMAKE_FIND_LIBRARY_SUFFIXES})
set(HDF5_${__lang}_FOUND True) set(HDF5_${__lang}_FOUND True)
mark_as_advanced(HDF5_${__lang}_DEFINITIONS) mark_as_advanced(HDF5_${__lang}_DEFINITIONS)
mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS) mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS)
@ -539,10 +593,14 @@ elseif(NOT HDF5_FOUND AND NOT _HDF5_NEED_TO_SEARCH)
endif() endif()
endif() endif()
if(HDF5_ROOT)
set(SEARCH_OPTS NO_DEFAULT_PATH)
endif()
find_program( HDF5_DIFF_EXECUTABLE find_program( HDF5_DIFF_EXECUTABLE
NAMES h5diff NAMES h5diff
HINTS ENV HDF5_ROOT HINTS ${HDF5_ROOT}
PATH_SUFFIXES bin Bin PATH_SUFFIXES bin Bin
${SEARCH_OPTS}
DOC "HDF5 file differencing tool." ) DOC "HDF5 file differencing tool." )
mark_as_advanced( HDF5_DIFF_EXECUTABLE ) mark_as_advanced( HDF5_DIFF_EXECUTABLE )
@ -557,9 +615,6 @@ if( NOT HDF5_FOUND )
set(HDF5_Fortran_LIBRARY_NAMES hdf5_fortran ${HDF5_C_LIBRARY_NAMES}) set(HDF5_Fortran_LIBRARY_NAMES hdf5_fortran ${HDF5_C_LIBRARY_NAMES})
set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5_hl_fortran ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES}) set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5_hl_fortran ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES})
if(HDF5_ROOT)
set(SEARCH_OPTS NO_DEFAULT_PATH)
endif()
foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS) foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS)
# find the HDF5 include directories # find the HDF5 include directories
if(LANGUAGE STREQUAL "Fortran") if(LANGUAGE STREQUAL "Fortran")
@ -571,7 +626,7 @@ if( NOT HDF5_FOUND )
endif() endif()
find_path(HDF5_${__lang}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME} find_path(HDF5_${__lang}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME}
HINTS ${HDF5_ROOT} ENV HDF5_ROOT HINTS ${HDF5_ROOT}
PATHS $ENV{HOME}/.local/include PATHS $ENV{HOME}/.local/include
PATH_SUFFIXES include Include PATH_SUFFIXES include Include
${SEARCH_OPTS} ${SEARCH_OPTS}
@ -597,17 +652,20 @@ if( NOT HDF5_FOUND )
endif() endif()
find_library(HDF5_${LIB}_LIBRARY_DEBUG find_library(HDF5_${LIB}_LIBRARY_DEBUG
NAMES ${THIS_LIBRARY_SEARCH_DEBUG} NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
${SEARCH_OPTS} ${SEARCH_OPTS}
) )
find_library( HDF5_${LIB}_LIBRARY_RELEASE find_library( HDF5_${LIB}_LIBRARY_RELEASE
NAMES ${THIS_LIBRARY_SEARCH_RELEASE} NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
${SEARCH_OPTS} ${SEARCH_OPTS}
) )
select_library_configurations( HDF5_${LIB} ) select_library_configurations( HDF5_${LIB} )
list(APPEND HDF5_${__lang}_LIBRARIES ${HDF5_${LIB}_LIBRARY}) list(APPEND HDF5_${__lang}_LIBRARIES ${HDF5_${LIB}_LIBRARY})
eNdforeach() endforeach()
if(HDF5_${__lang}_LIBRARIES)
set(HDF5_${__lang}_FOUND True)
endif()
# Append the libraries for this language binding to the list of all # Append the libraries for this language binding to the list of all
# required libraries. # required libraries.
@ -631,12 +689,12 @@ if( NOT HDF5_FOUND )
endif() endif()
find_library(HDF5_${LIB}_LIBRARY_DEBUG find_library(HDF5_${LIB}_LIBRARY_DEBUG
NAMES ${THIS_LIBRARY_SEARCH_DEBUG} NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
${SEARCH_OPTS} ${SEARCH_OPTS}
) )
find_library( HDF5_${LIB}_LIBRARY_RELEASE find_library( HDF5_${LIB}_LIBRARY_RELEASE
NAMES ${THIS_LIBRARY_SEARCH_RELEASE} NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
${SEARCH_OPTS} ${SEARCH_OPTS}
) )
select_library_configurations( HDF5_${LIB} ) select_library_configurations( HDF5_${LIB} )
@ -648,6 +706,9 @@ if( NOT HDF5_FOUND )
list(APPEND HDF5_HL_LIBRARIES ${HDF5_${__lang}_HL_LIBRARIES}) list(APPEND HDF5_HL_LIBRARIES ${HDF5_${__lang}_HL_LIBRARIES})
endif() endif()
endforeach() endforeach()
if(FIND_HL AND HDF5_HL_LIBRARIES)
set(HDF5_HL_FOUND True)
endif()
_HDF5_remove_duplicates_from_beginning(HDF5_INCLUDE_DIRS) _HDF5_remove_duplicates_from_beginning(HDF5_INCLUDE_DIRS)
_HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES) _HDF5_remove_duplicates_from_beginning(HDF5_LIBRARIES)
@ -707,4 +768,5 @@ endif()
find_package_handle_standard_args(HDF5 find_package_handle_standard_args(HDF5
REQUIRED_VARS ${HDF5_REQUIRED_VARS} REQUIRED_VARS ${HDF5_REQUIRED_VARS}
VERSION_VAR HDF5_VERSION VERSION_VAR HDF5_VERSION
HANDLE_COMPONENTS
) )