forked from HDFGroup/hdf5
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Set H5 specific vars immediately if legacy find (HDFGroup#4512)
* Set H5 specific vars immediately if legacy find * Correct find process vars (vs in-line build) * Correct SZIP find * Everything is libaec 1.0.6 or newer * Correct option help text
- Loading branch information
Showing
1 changed file
with
5 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,8 +10,8 @@ | |
# [email protected]. | ||
# | ||
option (USE_LIBAEC_STATIC "Use static AEC library" OFF) | ||
option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" OFF) | ||
option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" OFF) | ||
option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB else search" OFF) | ||
option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP else search" OFF) | ||
|
||
if (NOT ZLIB_USE_LOCALCONTENT) | ||
set (ZLIB_URL ${ZLIB_TGZ_ORIGPATH}/${ZLIB_TGZ_NAME}) | ||
|
@@ -119,14 +119,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT) | |
if (NOT SZIP_USE_EXTERNAL) | ||
set(libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC}) | ||
set(SZIP_FOUND FALSE) | ||
find_package (libaec 1.0.5 CONFIG) | ||
if (SZIP_FOUND) | ||
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${H5_SZIP_LIBRARIES}) | ||
else () | ||
find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) | ||
if (NOT SZIP_FOUND) | ||
find_package (SZIP) # Legacy find | ||
endif () | ||
find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) | ||
if (NOT SZIP_FOUND) | ||
find_package (SZIP) # Legacy find | ||
endif () | ||
set(H5_SZIP_FOUND ${SZIP_FOUND}) | ||
if (H5_SZIP_FOUND) | ||
|