mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-21 08:39:46 +08:00
Incorporate a recent change to netcdf_plugin_install_dir
This commit is contained in:
parent
ebd0229749
commit
7eaafef034
@ -666,7 +666,11 @@ if((NOT DEFINED HDF5_PLUGIN_PATH) OR ("${HDF5_PLUGIN_PATH}" STREQUAL ""))
|
|||||||
string(REPLACE "\\" "/" AUP "$ENV{ALLUSERSPROFILE}")
|
string(REPLACE "\\" "/" AUP "$ENV{ALLUSERSPROFILE}")
|
||||||
set(HDF5_PLUGIN_PATH "${AUP}/hdf5/lib/plugin")
|
set(HDF5_PLUGIN_PATH "${AUP}/hdf5/lib/plugin")
|
||||||
else()
|
else()
|
||||||
|
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
|
||||||
set(HDF5_PLUGIN_PATH "/usr/local/hdf5/lib/plugin")
|
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()
|
endif()
|
||||||
set(ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_PATH}")
|
set(ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_PATH}")
|
||||||
endif()
|
endif()
|
||||||
@ -696,7 +700,7 @@ if(NETCDF_ENABLE_PLUGIN_INSTALL)
|
|||||||
endif(DEFINED ENV{HDF5_PLUGIN_PATH})
|
endif(DEFINED ENV{HDF5_PLUGIN_PATH})
|
||||||
message(STATUS "Defaulting to -DPLUGIN_INSTALL_DIR=${NETCDF_PLUGIN_INSTALL_DIR}")
|
message(STATUS "Defaulting to -DPLUGIN_INSTALL_DIR=${NETCDF_PLUGIN_INSTALL_DIR}")
|
||||||
endif()
|
endif()
|
||||||
endif(ENABLE_PLUGIN_INSTALL)
|
endif(NETCDF_ENABLE_PLUGIN_INSTALL)
|
||||||
|
|
||||||
if(ENABLE_PLUGIN_INSTALL)
|
if(ENABLE_PLUGIN_INSTALL)
|
||||||
# Use the lowest priority dir in the path
|
# Use the lowest priority dir in the path
|
||||||
|
Loading…
Reference in New Issue
Block a user