From ce0b3ab161c56dce3e9c894b28bf3be7b2fb5d29 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Mon, 14 Oct 2024 16:29:47 -0600 Subject: [PATCH] test2 --- CMakeLists.txt | 6 ++---- test_common.in | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7ede04ccf..7954186ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") @@ -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) diff --git a/test_common.in b/test_common.in index 33f577a00b..5a3d1c29e9 100644 --- a/test_common.in +++ b/test_common.in @@ -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