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

Add patches to work around CMake versions (#12744)

Browse Source 
- Use of symbol testing macro requires explicit include()
- CMake policies are not version-portable and the support has to queried
  based on CMake version
This commit is contained in:
Piotr Luszczek 2019-09-07 20:04:20 -04:00 committed by Adam J. Stewart
parent c4da66be4c
commit bbdb033e5f
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/plasma/fix_cmake_include.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/Modules/FindMKL.cmake b/Modules/FindMKL.cmake
--- a/Modules/FindMKL.cmake
+++ b/Modules/FindMKL.cmake
@@ -33,6 +33,7 @@
set(MATH_LIB "-lm")
endif ()
set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+ include(CheckSymbolExists)
check_symbol_exists(cblas_cgemm mkl.h MKL_WORKS)
unset(CMAKE_REQUIRED_INCLUDES)
unset(CMAKE_REQUIRED_LIBRARIES)

2
var/spack/repos/builtin/packages/plasma/package.py
View File

@ -66,6 +66,8 @@ class Plasma(CMakePackage):
conflicts("%xl_r")
patch("remove_absolute_mkl_include.patch", when="@17.1")
patch("protect_cmake_version.patch", when="@19.8.0:19.8.9")
patch("fix_cmake_include.patch", when="@19.8.0:19.8.9")
@when("@18.9.0:")
def cmake_args(self):

25
var/spack/repos/builtin/packages/plasma/protect_cmake_version.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,8 +66,10 @@
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/Modules")
-cmake_policy(PUSH)
-cmake_policy(SET CMP0074 NEW) # allows to use CBLAS_ROOT and LAPACKE_ROOT
+if(${CMAKE_VERSION} VERSION_GREATER 11.99.9)
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0074 NEW) # allows to use CBLAS_ROOT and LAPACKE_ROOT
+endif()
find_package( CBLAS REQUIRED )
include_directories(${CBLAS_INCLUDE_DIRS})
@@ -82,7 +84,9 @@
find_package( LAPACKE REQUIRED )
include_directories(${LAPACKE_INCLUDE_DIRS})
+if(${CMAKE_VERSION} VERSION_GREATER 11.99.9)
cmake_policy(POP)
+endif()
set(PLASMA_LINALG_LIBRARIES ${LAPACKE_LIBRARIES} ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES} ${BLAS_LIBRARIES})