diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-10-22 21:08:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-10-22 21:08:52 (GMT) |
| commit | 096279caf76a542306b840fb90e1e753e8bbf748 (patch) | |
| tree | f486957d11a73caa677bd335258f1abb110c2927 | |
| parent | 164bae2439d490f5cc93e1068692d42d56d36b76 (diff) | |
| download | hdf5-096279caf76a542306b840fb90e1e753e8bbf748.zip hdf5-096279caf76a542306b840fb90e1e753e8bbf748.tar.gz hdf5-096279caf76a542306b840fb90e1e753e8bbf748.tar.bz2 | |
HDFFV-10608 Move toolchain files into a subfolder
| -rw-r--r-- | MANIFEST | 4 | ||||
| -rw-r--r-- | config/cmake/UserMacros/Windows_MT.cmake | 3 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 2 | ||||
| -rw-r--r-- | config/toolchain/GCC.cmake (renamed from config/GCC.cmake) | 0 | ||||
| -rw-r--r-- | config/toolchain/intel.cmake (renamed from config/intel.cmake) | 0 |
5 files changed, 5 insertions, 4 deletions
@@ -3161,8 +3161,8 @@ ./java/lib/ext/slf4j-simple-1.7.25.jar # CMake-specific Files -./config/GCC.cmake -./config/intel.cmake +./config/toolchain/GCC.cmake +./config/toolchain/intel.cmake ./config/cmake/cacheinit.cmake ./config/cmake/CMakeFindJavaCommon.cmake diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake index b6cc513..78d8277 100644 --- a/config/cmake/UserMacros/Windows_MT.cmake +++ b/config/cmake/UserMacros/Windows_MT.cmake @@ -14,7 +14,8 @@ ######################################################## # To use this option, copy both the macro and option code -# into the root UserMacros.cmake file. +# into the root UserMacros.cmake file. Then enable the option, +# using the command line add "-DBUILD_STATIC_CRT_LIBS:BOOL=ON" # OR add an include to the root UserMacros.cmake file: # INCLUDE(path_to_file/WINDOWS_MT.cmake) diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 440a3ae..629d277 100755 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -98,6 +98,6 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") ############################################################################################# ### use a toolchain file -#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/intel.cmake") +#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake") ############################################################################################# diff --git a/config/GCC.cmake b/config/toolchain/GCC.cmake index ddb1641..ddb1641 100644 --- a/config/GCC.cmake +++ b/config/toolchain/GCC.cmake diff --git a/config/intel.cmake b/config/toolchain/intel.cmake index f1a5734..f1a5734 100644 --- a/config/intel.cmake +++ b/config/toolchain/intel.cmake |