summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4ae935..14633ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -668,12 +668,12 @@ ENDIF (HDF5_USE_H5DUMP_PACKED_BITS)
ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
- IF (ZLIB_FOUND)
+ IF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB)
- ENDIF (ZLIB_FOUND)
- IF (SZIP_FOUND)
+ ENDIF (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
+ IF (SZIP_FOUND AND SZIP_USE_EXTERNAL)
ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP)
- ENDIF (SZIP_FOUND)
+ ENDIF (SZIP_FOUND AND SZIP_USE_EXTERNAL)
ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
#-----------------------------------------------------------------------------
@@ -709,6 +709,14 @@ IF (BUILD_TESTING)
ENDIF (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
ENDIF (H5_HAVE_PARALLEL)
ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
+
+ OPTION (HDF5_TEST_VFD "Execute tests with different VFDs" OFF)
+ MARK_AS_ADVANCED (HDF5_TEST_VFD)
+ IF (HDF5_TEST_VFD)
+ OPTION (HDF5_TEST_FHEAP_VFD "Execute tests with different VFDs" ON)
+ MARK_AS_ADVANCED (HDF5_TEST_FHEAP_VFD)
+ ENDIF (HDF5_TEST_VFD)
+
INCLUDE (${HDF5_SOURCE_DIR}/CTestConfig.cmake)
CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/CTestCustom.cmake ${HDF5_BINARY_DIR}/CTestCustom.ctest @ONLY)
ENDIF (BUILD_TESTING)