Skip to content

Relocation Fixes, master branch (2022.03.21.)

Attila Krasznahorkay requested to merge akraszna/athena:RelocationFixes-master-20220321 into master

Unfortunately a number of issues sneaked into the configuration in the last few years which made /cvmfs/... paths appear in the exported CMake configuration of the Athena project, as reported in ATLINFR-4465. This commit is meant to fix all of them.

  • A number of <FOO>_INCLUDE_DIR -> <FOO>_INCLUDE_DIRS replacements are made, as only the latter are set up to be relocatable in our configuration.
  • FindHDF5's C++ specific variables are replaced with the more generic ones in HDF5Utils, as only the generic variables are set up to be relocatable. And we only use the C++ interface of HDF5 in that package anyway.
  • The "find order" of LAPACK and BLAS is switched in VrtSecInclusive. FindLAPACK actually calls on FindBLAS itself internally. And the way we make paths relocatable in the ATLAS specific FindBLAS module is negated when FindLAPACK triggers a second call to that module.

Pinging @fwinkl and @tvarol.

Merge request reports