summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-10-19 18:33:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-10-19 18:33:12 (GMT)
commitcd7a896ee49b5ef1d5f8328e7b6206e8d0bf6ced (patch)
tree22aeacac28eeaef17adf278452ca0c730c8ef1f0
parente3e0289d4314f914b0bcb9d3141aaa45d85a5e7d (diff)
downloadhdf5-cd7a896ee49b5ef1d5f8328e7b6206e8d0bf6ced.zip
hdf5-cd7a896ee49b5ef1d5f8328e7b6206e8d0bf6ced.tar.gz
hdf5-cd7a896ee49b5ef1d5f8328e7b6206e8d0bf6ced.tar.bz2
Move options to root CMakeLists.txt
-rw-r--r--CMakeLists.txt6
-rw-r--r--src/CMakeLists.txt1
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53cddf7..e2fb000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -913,4 +913,10 @@ endif ()
#-----------------------------------------------------------------------------
configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
+#-----------------------------------------------------------------------------
+# Options for use by cross compiling and toolchains
+#-----------------------------------------------------------------------------
+option (HDF5_USE_PREGEN "Use pre-generated Files" OFF)
+option (HDF5_BATCH_H5DETECT "Use a batch command for running h5detect" OFF)
+
include (CMakeInstallation.cmake)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 610111b..5104019 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -877,7 +877,6 @@ endif ()
# Setup the H5detect utility which generates H5Tinit with platform
# specific type checks inside
#-----------------------------------------------------------------------------
-option (HDF5_USE_PREGEN "Use pre-generated Files" OFF)
if (HDF5_USE_PREGEN)
set (HDF5_GENERATED_SOURCE_DIR ${HDF5_USE_PREGEN_DIR})
else ()