diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-08-17 16:17:58 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-17 16:17:58 (GMT) |
commit | f777350e82a0306141d3c6eb8adddc096b1c8ff1 (patch) | |
tree | ee29d824a148ad82095a3413b58d1f107007e112 /config/cmake | |
parent | 9c9f70ed695a0022a55bf53d085b7540ae5b5281 (diff) | |
download | hdf5-f777350e82a0306141d3c6eb8adddc096b1c8ff1.zip hdf5-f777350e82a0306141d3c6eb8adddc096b1c8ff1.tar.gz hdf5-f777350e82a0306141d3c6eb8adddc096b1c8ff1.tar.bz2 |
Correct target name for szaec lib - merge #2000 (#2003)
Diffstat (limited to 'config/cmake')
-rw-r--r-- | config/cmake/CTestCustom.cmake | 1 | ||||
-rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index b2edefc..53d815e 100644 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -20,6 +20,7 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "note.*expected.*void.*but argument is of type.*volatile" "plugin-build.*:[ \t]*warning" + "stamp.verify" "CMake Warning*stamp" "src.ZLIB.*:[ \t]*warning" "warning LNK4197:.*ZLIB-prefix" diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 29a6560..6e78f40 100755 --- 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") - -############################################################################################# |