diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-09-11 22:27:20 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-09-11 13:27:20 -0700 |
| commit | 8dd7fa03ea903bdbc36b5ba13837892c84589bee (patch) | |
| tree | 4d0716d09d7b6596f1e0c81610f2a56c5b8612f3 /var | |
| parent | 947cd8e3c040db54e20efc1a89b67827c40e7019 (diff) | |
| download | spack-8dd7fa03ea903bdbc36b5ba13837892c84589bee.tar.gz spack-8dd7fa03ea903bdbc36b5ba13837892c84589bee.tar.bz2 spack-8dd7fa03ea903bdbc36b5ba13837892c84589bee.tar.xz spack-8dd7fa03ea903bdbc36b5ba13837892c84589bee.zip | |
elemental: fix broken Config.cmake (#5331)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/elemental/cmake_0.87.7.patch | 22 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/elemental/package.py | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/elemental/cmake_0.87.7.patch b/var/spack/repos/builtin/packages/elemental/cmake_0.87.7.patch new file mode 100644 index 0000000000..a33f5ef0b6 --- /dev/null +++ b/var/spack/repos/builtin/packages/elemental/cmake_0.87.7.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/configure_files/ElementalConfig.cmake.in b/cmake/configure_files/ElementalConfig.cmake.in +index d37649f..8511d81 100644 +--- a/cmake/configure_files/ElementalConfig.cmake.in ++++ b/cmake/configure_files/ElementalConfig.cmake.in +@@ -1,6 +1,8 @@ + set(Elemental_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") + set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@MPI_CXX_INCLUDE_PATH@") +-set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@QD_INCLUDES@") ++IF(@QD_FOUND@) ++ set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@QD_INCLUDES@") ++ENDIF() + set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@MPC_INCLUDES@") + set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@MPFR_INCLUDES@") + set(Elemental_INCLUDE_DIRS "${Elemental_INCLUDE_DIRS};@GMP_INCLUDES@") +@@ -13,6 +15,6 @@ set(Elemental_LINK_FLAGS "@EL_LINK_FLAGS@") + set(Elemental_DEFINITIONS "@Qt5Widgets_DEFINITIONS@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("@CMAKE_INSTALL_PREFIX@/CMake/ElementalTargets.cmake") ++include("${CMAKE_CURRENT_LIST_DIR}/ElementalTargets.cmake") + + set(Elemental_LIBRARIES El) diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index c356c9f717..065fb16fa6 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -92,6 +92,7 @@ class Elemental(CMakePackage): depends_on('mpfr') patch('elemental_cublas.patch', when='+cublas') + patch('cmake_0.87.7.patch', when='@0.87.7') @property def libs(self): |