don't override hdf5_external cache var

Author: scivision

VERSION

@@ -1 +1 @@
-4.2.9
+4.2.10

cmake/install.cmake

@@ -3,21 +3,25 @@
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
-  INSTALL_DESTINATION cmake)
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
+INSTALL_DESTINATION cmake
+)
 
 write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
-  COMPATIBILITY SameMinorVersion)
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
+COMPATIBILITY SameMinorVersion
+)
 
 install(EXPORT ${PROJECT_NAME}-targets
-  NAMESPACE ${PROJECT_NAME}::
-  DESTINATION cmake)
+NAMESPACE ${PROJECT_NAME}::
+DESTINATION cmake
+)
 
 install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
-  DESTINATION cmake)
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
+DESTINATION cmake
+)
 
 # --- CPack
 
@@ -37,6 +41,7 @@ string(REGEX REPLACE "\n" ";" _cpack_ignore ${_cpack_ignore})
 set(CPACK_SOURCE_IGNORE_FILES "${_cpack_ignore}")
 
 install(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE}
-  DESTINATION share/docs/${PROJECT_NAME})
+DESTINATION share/docs/${PROJECT_NAME}
+)
 
 include(CPack)

cmake/options.cmake

@@ -1,9 +1,6 @@
-
-option(hdf5_external "Build HDF5 library")
 option(autobuild "auto-build HDF5 if missing/broken" on)
 option(dev "developer mode")
 
-option(shaky "run shaky tests that may segfault since designed to fail" off)
 option(matlab "check HDF5 file writes with Matlab" off)
 option(concepts "conceptual testing, for devs only" off)
 

src/tests/CMakeLists.txt

@@ -80,8 +80,9 @@ endif()
 find_package(Python3 COMPONENTS Interpreter)
 if(NOT DEFINED h5py_ok)
   execute_process(COMMAND ${Python3_EXECUTABLE} -c "import h5py"
-    RESULT_VARIABLE h5py_code
-    TIMEOUT 15)
+  RESULT_VARIABLE h5py_code
+  TIMEOUT 15
+  )
   if(h5py_code EQUAL 0)
     set(h5py_ok true CACHE BOOL "h5py OK")
   else()
@@ -90,7 +91,8 @@ if(NOT DEFINED h5py_ok)
 endif()
 
 add_test(NAME h5fortran:PythonShape
-  COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_shape.py ${shape_file})
+COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_shape.py ${shape_file}
+)
 
 set_tests_properties(h5fortran:PythonShape PROPERTIES
 REQUIRED_FILES ${shape_file}
@@ -109,11 +111,12 @@ if(Matlab_FOUND)
   add_test(NAME h5fortran:MatlabShape COMMAND ${Matlab_MAIN_PROGRAM} -batch ${matlab_cmd})
 
   set_tests_properties(h5fortran:MatlabShape PROPERTIES
-    TIMEOUT 90
-    LABELS shaky
-    DEPENDS h5fortran:shape
-    REQUIRED_FILES ${shape_file}
-    FIXTURES_REQUIRED h5lib)
+  TIMEOUT 90
+  LABELS shaky
+  DEPENDS h5fortran:shape
+  REQUIRED_FILES ${shape_file}
+  FIXTURES_REQUIRED h5lib
+  )
 
 endif(Matlab_FOUND)
 endif(matlab)