Skip to content

Commit

Permalink
Incorporate a recent change to netcdf_plugin_install_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@WardF
WardF committed Sep 30, 2024
1 parent ebd0229 commit 7eaafef
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,11 @@ if((NOT DEFINED HDF5_PLUGIN_PATH) OR ("${HDF5_PLUGIN_PATH}" STREQUAL ""))
string(REPLACE "\\" "/" AUP "$ENV{ALLUSERSPROFILE}")
set(HDF5_PLUGIN_PATH "${AUP}/hdf5/lib/plugin")
else()
set(HDF5_PLUGIN_PATH "/usr/local/hdf5/lib/plugin")
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
set(HDF5_PLUGIN_PATH "/usr/local/hdf5/lib/plugin")
else()
set(HDF5_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/hdf5/lib/plugin")
endif(NOT DEFINED CMAKE_INSTALL_PREFIX)
endif()
set(ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_PATH}")
endif()
Expand Down Expand Up @@ -696,7 +700,7 @@ if(NETCDF_ENABLE_PLUGIN_INSTALL)
endif(DEFINED ENV{HDF5_PLUGIN_PATH})
message(STATUS "Defaulting to -DPLUGIN_INSTALL_DIR=${NETCDF_PLUGIN_INSTALL_DIR}")
endif()
endif(ENABLE_PLUGIN_INSTALL)
endif(NETCDF_ENABLE_PLUGIN_INSTALL)

if(ENABLE_PLUGIN_INSTALL)
# Use the lowest priority dir in the path
Expand Down

1 comment on commit 7eaafef

@DennisHeimbigner
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

      set(HDF5_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/hdf5/lib/plugin")

I am not sure this is correct. The original path /usr/local/hdf5/lib/plugin (and its windows equivalent)
appear to baked into the HDF5 code.

Please sign in to comment.