diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-03-25 22:08:46 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-03-25 22:08:46 (GMT) |
| commit | 451a91e53bdc0f930c2acf382d14a5e2fd9cb2d9 (patch) | |
| tree | 145b94b29e9cc5b7f9c6b2477d076f793430d62e /CMakeFilters.cmake | |
| parent | d3114a96da64de8ea987f7c1714f8ad4a2474f4e (diff) | |
| download | hdf5-451a91e53bdc0f930c2acf382d14a5e2fd9cb2d9.zip hdf5-451a91e53bdc0f930c2acf382d14a5e2fd9cb2d9.tar.gz hdf5-451a91e53bdc0f930c2acf382d14a5e2fd9cb2d9.tar.bz2 | |
[svn-r26594] Merge macros and fortran changes from dual_binary feature.
Tested: local linux
Diffstat (limited to 'CMakeFilters.cmake')
| -rw-r--r-- | CMakeFilters.cmake | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 3a2bec4..7050f87 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake @@ -1,16 +1,4 @@ -#----------------------------------------------------------------------------- -# Options for HDF5 Filters -#----------------------------------------------------------------------------- -MACRO (HDF5_SETUP_FILTERS FILTER) - option (HDF5_USE_FILTER_${FILTER} "Use the ${FILTER} Filter" ON) - if (HDF5_USE_FILTER_${FILTER}) - set (H5_HAVE_FILTER_${FILTER} 1) - set (FILTERS "${FILTERS} ${FILTER}") - endif (HDF5_USE_FILTER_${FILTER}) - # message (STATUS "Filter ${FILTER} is ${HDF5_USE_FILTER_${FILTER}}") -ENDMACRO (HDF5_SETUP_FILTERS) - include (ExternalProject) #option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO SVN TGZ)" "NO") set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO SVN TGZ)") @@ -43,6 +31,9 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT}) if (NOT ZLIB_FOUND) find_package (ZLIB) # Legacy find + if (ZLIB_FOUND) + set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES}) + endif (ZLIB_FOUND) endif (NOT ZLIB_FOUND) endif (NOT ZLIB_USE_EXTERNAL) if (ZLIB_FOUND) @@ -51,7 +42,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) set (H5_HAVE_LIBZ 1) set (H5_ZLIB_HEADER "zlib.h") set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) - set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) + set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) else (ZLIB_FOUND) if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE}) @@ -87,6 +78,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT) find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}) if (NOT SZIP_FOUND) find_package (SZIP) # Legacy find + if (SZIP_FOUND) + set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES}) + endif (SZIP_FOUND) endif (NOT SZIP_FOUND) endif (NOT SZIP_USE_EXTERNAL) if (SZIP_FOUND) |