summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-07-12 20:42:49 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-07-17 16:58:03 (GMT)
commit7ba562a82017779829394d5a5e03b62e69d6c926 (patch)
treeac5de2ce6f506844db708394297394fb143bcd71 /test
parentd586a457b2c3d0377b8752a6ce9b621a5994f56e (diff)
downloadhdf5-7ba562a82017779829394d5a5e03b62e69d6c926.zip
hdf5-7ba562a82017779829394d5a5e03b62e69d6c926.tar.gz
hdf5-7ba562a82017779829394d5a5e03b62e69d6c926.tar.bz2
HDFFV-10845 fix configure check and PATHs
Diffstat (limited to 'test')
-rw-r--r--test/CMakeTests.cmake4
-rw-r--r--test/flushrefreshTest.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 3d986d2..b138f14 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -885,7 +885,7 @@ endif ()
### F I L T E R P L U G I N T E S T S
##############################################################################
if (BUILD_SHARED_LIBS)
- if (WIN32)
+ if (WIN32 OR MINGW)
set (CMAKE_SEP "\;")
set (BIN_REL_PATH "../../")
else ()
@@ -982,7 +982,7 @@ endif ()
### V O L P L U G I N T E S T S
##############################################################################
if (BUILD_SHARED_LIBS)
- if (WIN32)
+ if (WIN32 OR MINGW)
set (CMAKE_SEP "\;")
set (BIN_REL_PATH "../../")
else ()
diff --git a/test/flushrefreshTest.cmake b/test/flushrefreshTest.cmake
index 73210ef..926efba 100644
--- a/test/flushrefreshTest.cmake
+++ b/test/flushrefreshTest.cmake
@@ -41,7 +41,7 @@ endif ()
message (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
if (TEST_LIBRARY_DIRECTORY)
- if (WIN32 AND NOT MINGW)
+ if (WIN32 OR MINGW)
set (ENV{PATH} "$ENV{PATH};${TEST_LIBRARY_DIRECTORY}")
else ()
set (ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${TEST_LIBRARY_DIRECTORY}")