Skip to content

Commit

Permalink
test2
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisHeimbigner committed Oct 14, 2024
1 parent eeb210c commit ce0b3ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,6 @@ option(NETCDF_PLUGIN_INSTALL "Enable plugin installation" NO)
# -- %ALLUSERSPROFILE%/hdf5/lib/plugins If on a windows or Mingw platform
if(ISMSVC OR ISMINGW)
set(PLATFORMDEFAULT "$ENV{ALLUSERSPROFILE}\\hdf5\\lib\\plugin")
# Fix back slashes
string(REPLACE "\\\\" "/" PLATFORMDEFAULT "${PLATFORMDEFAULT}")
set(PLATFORMSEP ";")
else()
set(PLATFORMDEFAULT "/usr/local/hdf5/lib/plugin")
Expand Down Expand Up @@ -674,8 +672,8 @@ else() # Table row 1
set(DEFAULT_PLUGIN_SEARCH_PATH "${PLATFORMDEFAULT}")
endif()
# canonical form is all forward slashes
string(REPLACE "\\\\" "/" DEFAULT_PLUGIN_INSTALL_DIR "${DEFAULT_PLUGIN_INSTALL_DIR}")
string(REPLACE "\\\\" "/" DEFAULT_PLUGIN_SEARCH_PATH "${DEFAULT_PLUGIN_SEARCH_PATH}")
string(REPLACE "\\" "/" DEFAULT_PLUGIN_INSTALL_DIR "${DEFAULT_PLUGIN_INSTALL_DIR}")
string(REPLACE "\\" "/" DEFAULT_PLUGIN_SEARCH_PATH "${DEFAULT_PLUGIN_SEARCH_PATH}")

# Inferences
if (DEFINED DEFAULT_PLUGIN_INSTALL_DIR)
Expand Down
4 changes: 2 additions & 2 deletions test_common.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ FEATURE_S3TESTS=@NETCDF_ENABLE_S3_TESTING@
FEATURE_NCZARR_ZIP=@HAS_NCZARR_ZIP@
FEATURE_LARGE_TESTS=@DO_LARGE_TESTS@

FEATURE_PLUGIN_INSTALL_DIR=@NETCDF_PLUGIN_INSTALL_DIR@
FEATURE_PLUGIN_SEARCH_PATH=@NETCDF_PLUGIN_SEARCH_PATH@
FEATURE_PLUGIN_INSTALL_DIR="@NETCDF_PLUGIN_INSTALL_DIR@"
FEATURE_PLUGIN_SEARCH_PATH="@NETCDF_PLUGIN_SEARCH_PATH@"

# Thredds-test server is currently disabled
#FEATURE_THREDDSTEST=1
Expand Down

0 comments on commit ce0b3ab

Please sign in to comment.