Skip to content

Commit

Permalink
Deprecate use of variables <PackageName>_DIRECTORY_HINTS
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidAce committed May 31, 2021
1 parent bcb89e7 commit 522db66
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions cmake/FindHDF5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,6 @@ function(find_package_hdf5_exec_wrapper)
${HDF5_ROOT}
$ENV{HDF5_ROOT}
${HDF5_PREFIX_PATH}
${HDF5_DIRECTORY_HINTS}
${H5PP_DIRECTORY_HINTS}
${EBROOTHDF5})
list(REMOVE_DUPLICATES HDF5_PATHS)
if(NOT HDF5_NO_DEFAULT_PATH)
Expand Down
8 changes: 0 additions & 8 deletions cmake/SetupSearchPaths.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,24 @@ list(APPEND H5PP_CONAN_CANDIDATE_PATHS
# Append candidate paths to <PackageName>_ROOT variables so that find_package(...) calls can search these paths
# Note that user-specified paths are searched first.
list(APPEND Eigen3_ROOT
${EIGEN3_PREFIX_PATH}
${EIGEN3_DIRECTORY_HINTS}
$ENV{EBROOTEIGEN}
${CMAKE_INSTALL_PREFIX}/Eigen3
${CMAKE_INSTALL_PREFIX}
)

list(APPEND spdlog_ROOT
${SPDLOG_PREFIX_PATH}
${SPDLOG_DIRECTORY_HINTS}
$ENV{EBROOTSPDLOG}
${CMAKE_INSTALL_PREFIX}/spdlog
${CMAKE_INSTALL_PREFIX}
)

list(APPEND fmt_ROOT
${FMT_PREFIX_PATH}
${FMT_DIRECTORY_HINTS}
$ENV{EBROOTFMT}
${CMAKE_INSTALL_PREFIX}/fmt
${CMAKE_INSTALL_PREFIX}
)

list(APPEND HDF5_ROOT
${HDF5_PREFIX_PATH}
${HDF5_DIRECTORY_HINTS}
$ENV{EBROOTHDF5}
$ENV{HDF5_ROOT}
${CMAKE_INSTALL_PREFIX}/hdf5
Expand Down

0 comments on commit 522db66

Please sign in to comment.