diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-10-19 18:49:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-10-19 18:49:33 (GMT) |
| commit | 5f99891e6dc59524fb6e43ca96a86df22b403c61 (patch) | |
| tree | 53a165ebcedf95379341dfbd9b43ca15732e0a5d | |
| parent | 4e575a086553a23fc79d3e92f48eb9508711e6ca (diff) | |
| parent | 494d39f1c2f6225c732cb857c860d6b475d03226 (diff) | |
| download | hdf5-5f99891e6dc59524fb6e43ca96a86df22b403c61.zip hdf5-5f99891e6dc59524fb6e43ca96a86df22b403c61.tar.gz hdf5-5f99891e6dc59524fb6e43ca96a86df22b403c61.tar.bz2 | |
Merge pull request #1299 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '494d39f1c2f6225c732cb857c860d6b475d03226':
Move options to root cmake file
EED-258 Add modules uses toolchain files
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | config/GCC.cmake | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
4 files changed, 17 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) @@ -3160,6 +3160,7 @@ ./java/lib/ext/slf4j-simple-1.7.25.jar # CMake-specific Files +./config/GCC.cmake ./config/intel.cmake ./config/cmake/cacheinit.cmake diff --git a/config/GCC.cmake b/config/GCC.cmake new file mode 100644 index 0000000..ddb1641 --- /dev/null +++ b/config/GCC.cmake @@ -0,0 +1,10 @@ +# Uncomment the following to use cross-compiling +#set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_COMPILER_VENDOR "GCC") + +set(CMAKE_C_COMPILER cc) +set(CMAKE_CXX_COMPILER c++) +set(CMAKE_Fortran_COMPILER gfortran) + +# the following is used if cross-compiling +set(CMAKE_CROSSCOMPILING_EMULATOR "") 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 () |