diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-09-16 22:14:03 +0200 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2017-09-16 13:14:03 -0700 |
| commit | f710a520e5246bc95e95506b8831b72237c2172c (patch) | |
| tree | 65ca7d16937f1134e5c14d6d7ab8911a35eb5af3 /lib | |
| parent | 7cec47aacd41d314ebcef8d585816d54b0c5961a (diff) | |
| download | spack-f710a520e5246bc95e95506b8831b72237c2172c.tar.gz spack-f710a520e5246bc95e95506b8831b72237c2172c.tar.bz2 spack-f710a520e5246bc95e95506b8831b72237c2172c.tar.xz spack-f710a520e5246bc95e95506b8831b72237c2172c.zip | |
set CMAKE_PREFIX_PATH for cmake packages (#5364)
* cmake: set CMAKE_PREFIX_PATH
* cmake: use build/link immediate dependencies to construct CMAKE_PREFIX_PATH
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/cmake.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 026cf7903a..edc9751c82 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -145,6 +145,11 @@ class CMakePackage(PackageBase): args.append('-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE') rpaths = ':'.join(spack.build_environment.get_rpaths(pkg)) args.append('-DCMAKE_INSTALL_RPATH:STRING={0}'.format(rpaths)) + # CMake's find_package() looks in CMAKE_PREFIX_PATH first, help CMake + # to find immediate link dependencies in right places: + deps = [d.prefix for d in + pkg.spec.dependencies(deptype=('build', 'link'))] + args.append('-DCMAKE_PREFIX_PATH:STRING={0}'.format(';'.join(deps))) return args @property |