diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53cddf7d08..e2fb000da8 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 610111b916..5104019fa7 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 ()