Skip to content

Commit

Permalink
Removing redundant env var WITH_HDF5_SCORPIO in buildlib.spio
Browse files Browse the repository at this point in the history
If HDF5_ROOT is already set as an env var, it is sufficient to turn
on the WITH_HDF5 CMake option for scorpio. Introducing a new env var
like WITH_HDF5_SCORPIO may lead to unnecessary confusion.

Additionally, for now, maintain the WITH_HDF5 CMake option as OFF by
default to prevent potential build errors with the default scorpio
1.4.2 submodule.
  • Loading branch information
dqwu committed Dec 4, 2023
1 parent 1921517 commit 34b0875
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions share/build/buildlib.spio
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ def buildlib(bldroot, installpath, case):
# elif which_h5dump is not None:
# os.environ["HDF5"] = os.path.dirname(os.path.dirname(which_h5dump))

if "WITH_HDF5_SCORPIO" in os.environ:
cmake_opts += "-DWITH_HDF5:BOOL=ON "
# Before E3SM upgrades scorpio submodule to 1.5.0 or higher, keep WITH_HDF5
# CMake option OFF by default.
# if "HDF5_ROOT" in os.environ:
# cmake_opts += "-DWITH_HDF5:BOOL=ON "

# Same deal with libz and szip
if "ZLIB_ROOT" in os.environ:
Expand Down

0 comments on commit 34b0875

Please sign in to comment.