diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-12 14:09:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-12 14:11:09 (GMT) |
| commit | d55ab3526c57d2dbe9d9950516d7a01b9e49216c (patch) | |
| tree | 104a1374e9c414d2a5172457a1d5834289a232bf | |
| parent | 7b487184d85dd22eab5c6834de3f2536eea9eb28 (diff) | |
| parent | 931492bd6f71d6a38cbec518c759de7bdb440fdf (diff) | |
| download | CMake-d55ab3526c57d2dbe9d9950516d7a01b9e49216c.zip CMake-d55ab3526c57d2dbe9d9950516d7a01b9e49216c.tar.gz CMake-d55ab3526c57d2dbe9d9950516d7a01b9e49216c.tar.bz2 | |
Merge topic 'findhdf5-temporary-files'
931492bd6f FindHDF5: use CMakeFiles for temporary files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4879
| -rw-r--r-- | Modules/FindHDF5.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 60a313d..7a1c252 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -125,8 +125,6 @@ The following variables can be set to guide the search for HDF5 libraries and in Set ``true`` to skip trying to find ``hdf5-config.cmake``. #]=======================================================================] -# This module is maintained by Will Dicharry <wdicharry@stellarscience.com>. - include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) @@ -347,6 +345,7 @@ function( _HDF5_invoke_compiler language output_var return_value_var version_var # wrapper exists, but not the compiler. E.g. Miniconda / Anaconda Python execute_process( COMMAND ${HDF5_${language}_COMPILER_EXECUTABLE} ${test_file} + WORKING_DIRECTORY ${scratch_dir} RESULT_VARIABLE return_value ) if(return_value) @@ -355,6 +354,7 @@ function( _HDF5_invoke_compiler language output_var return_value_var version_var else() execute_process( COMMAND ${HDF5_${language}_COMPILER_EXECUTABLE} -show ${lib_type_args} ${test_file} + WORKING_DIRECTORY ${scratch_dir} OUTPUT_VARIABLE output ERROR_VARIABLE output RESULT_VARIABLE return_value |