From 7e00924d1b9d235b988e63556e3f2c2644bae543 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 18 Oct 2018 14:44:27 -0500 Subject: EED-258 Add modules uses toolchain files --- MANIFEST | 1 + config/GCC.cmake | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 config/GCC.cmake diff --git a/MANIFEST b/MANIFEST index b820622..2ca6110 100644 --- a/MANIFEST +++ b/MANIFEST @@ -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 "") -- cgit v0.12 From 494d39f1c2f6225c732cb857c860d6b475d03226 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 19 Oct 2018 13:34:31 -0500 Subject: Move options to root cmake file --- CMakeLists.txt | 6 ++++++ src/CMakeLists.txt | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) 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 () -- cgit v0.12