summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-01-21 14:16:59 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-01-21 14:17:39 (GMT)
commit7838a065a68f3c9d187b9af1d5df76579574953e (patch)
treec5de251b9638694947e3d87bddacbec90141e017
parent15fe8cf8a5c1ca2bd60971866d8cea9e6125629f (diff)
parentb9246693857b26e24e5a46e88698ff87c52e83fa (diff)
downloadCMake-7838a065a68f3c9d187b9af1d5df76579574953e.zip
CMake-7838a065a68f3c9d187b9af1d5df76579574953e.tar.gz
CMake-7838a065a68f3c9d187b9af1d5df76579574953e.tar.bz2
Merge topic 'FindHDF5-silence-output' into release-3.19
b924669385 FindHDF5: silence STATUS messages when found with QUIET 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5722
-rw-r--r--Modules/FindHDF5.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 25f5a1f..38388d9 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -360,9 +360,11 @@ function( _HDF5_invoke_compiler language output_var return_value_var version_var
execute_process(
COMMAND ${HDF5_${language}_COMPILER_EXECUTABLE} ${test_file}
WORKING_DIRECTORY ${scratch_dir}
+ OUTPUT_VARIABLE output
+ ERROR_VARIABLE output
RESULT_VARIABLE return_value
)
- if(return_value)
+ if(return_value AND NOT HDF5_FIND_QUIETLY)
message(STATUS
"HDF5 ${language} compiler wrapper is unable to compile a minimal HDF5 program.")
else()
@@ -374,7 +376,7 @@ function( _HDF5_invoke_compiler language output_var return_value_var version_var
RESULT_VARIABLE return_value
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- if(return_value)
+ if(return_value AND NOT HDF5_FIND_QUIETLY)
message(STATUS
"Unable to determine HDF5 ${language} flags from HDF5 wrapper.")
endif()
@@ -385,7 +387,7 @@ function( _HDF5_invoke_compiler language output_var return_value_var version_var
RESULT_VARIABLE return_value
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- if(return_value)
+ if(return_value AND NOT HDF5_FIND_QUIETLY)
message(STATUS
"Unable to determine HDF5 ${language} version_var from HDF5 wrapper.")
endif()