diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-04-04 15:41:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-04-04 15:41:15 (GMT) |
| commit | 12616e370c006764602a1c4f77136851f9397ca1 (patch) | |
| tree | 0c23b3b4aee2cbecac64b84a4db2d33979aaa7a8 | |
| parent | a259cbdda792c4167a082d10d8b9496ab19a8993 (diff) | |
| download | hdf5-12616e370c006764602a1c4f77136851f9397ca1.zip hdf5-12616e370c006764602a1c4f77136851f9397ca1.tar.gz hdf5-12616e370c006764602a1c4f77136851f9397ca1.tar.bz2 | |
[svn-r23547] Windows plugins will always be "dll"'s.
CMake also uses ";" as a separator - escape it
Tested: windows
| -rw-r--r-- | src/H5PL.c | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -456,7 +456,7 @@ H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, void **info) FUNC_ENTER_STATIC /* Specify a file mask. *.* = We want everything! */ - sprintf(service, "%s\/*.*", dir); + sprintf(service, "%s\/*.dll", dir); if((hFind = FindFirstFile(service, &fdFile)) == INVALID_HANDLE_VALUE) HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 19f610f..8904fee 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -639,7 +639,7 @@ ADD_TEST (NAME testlibinfo COMMAND ${CMAKE_COMMAND} -D "TEST_PROGRAM=$<TARGET_FI IF (BUILD_SHARED_LIBS) IF (WIN32 AND NOT CYGWIN) - SET(CMAKE_SEP ";") + SET(CMAKE_SEP "\;") ELSE (WIN32 AND NOT CYGWIN) SET(CMAKE_SEP ":") ENDIF(WIN32 AND NOT CYGWIN) |