diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-09-01 01:59:57 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-09-01 01:59:57 (GMT) |
| commit | e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92 (patch) | |
| tree | fa38a912d34f802629cecab41bae61a2a7d5d1c0 /config | |
| parent | d0a62ef975b1ff52e872ae260de82a42d0fd9fca (diff) | |
| download | hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.zip hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.tar.gz hdf5-e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92.tar.bz2 | |
HDFFV-10568 fix hdf5_java library dependency
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index f1d5e1d..aa18022 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -380,13 +380,14 @@ macro (HDF_DIR_PATHS package_prefix) set (CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules." ) - if (WIN32) - set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE}) + get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if(_isMultiConfig) + set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}) set (CMAKE_PDB_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files." ) else () - set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE}) + set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) endif () else () # if we are externally configured, but the project uses old cmake scripts |