diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-08-08 20:01:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 20:01:06 (GMT) |
| commit | 60ba2356de3f074b18acf2ba7737da160274b803 (patch) | |
| tree | 81beb9bfbcd551878ea6b8656b70e2f3a0549f4f /config/cmake/scripts | |
| parent | 5d63aca604713973ef6079deb0da247efa0e077a (diff) | |
| download | hdf5-60ba2356de3f074b18acf2ba7737da160274b803.zip hdf5-60ba2356de3f074b18acf2ba7737da160274b803.tar.gz hdf5-60ba2356de3f074b18acf2ba7737da160274b803.tar.bz2 | |
Revert for older cmake versions (#1974)
* Revert for older cmake versions
* Remove unneeded clear/clean tests because of changes to test macro
Diffstat (limited to 'config/cmake/scripts')
| -rw-r--r-- | config/cmake/scripts/HDF5options.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 8ad432f..8d224ff 100644 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -21,10 +21,15 @@ #set (MAX_PROC_COUNT 8) ############################################################################################# -#### alternate toolsets #### +#### alternate toolsets (Windows usually) #### #set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0") ############################################################################################# +### use a toolchain file (supported everywhere) #### + +#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake") + +############################################################################################# #### Only build static libraries #### #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF") #### Only build shared libraries #### @@ -101,8 +106,3 @@ endif() 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/toolchain/intel.cmake") - -############################################################################################# |