zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

elemental: fix broken Config.cmake (#5331)

Browse Source
This commit is contained in:
Denis Davydov
2017-09-11 22:27:20 +02:00
committed by Todd Gamblin
parent 947cd8e3c0
commit 8dd7fa03ea
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/elemental/cmake_0.87.7.patch Normal file
View File

@@ -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)

1
var/spack/repos/builtin/packages/elemental/package.py
View File

@@ -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):