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

Patch CMake version check in Umpire (#19590)

Browse Source 
* Patch CMake version check in Umpire

* Update version constraint for cmake_version_check patch

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Add maintainers to Umpire

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
David Beckingsale 2020-10-29 11:32:56 -07:00 committed by GitHub
parent 518124c14a
commit e2a720930a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/umpire/cmake_version_check.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/umpire/CMakeLists.txt b/src/umpire/CMakeLists.txt
index 18518f13..c2e45e03 100644
--- a/src/umpire/CMakeLists.txt
+++ b/src/umpire/CMakeLists.txt
@@ -105,7 +105,7 @@ blt_add_library(
DEPENDS_ON ${umpire_depends}
DEFINES ${umpire_defines})
-if (NOT WIN32 AND CMAKE_VERSION VERSION_GREATER 3.17)
+if (NOT WIN32 AND NOT ${CMAKE_VERSION} VERSION_LESS 3.18)
target_link_options(
umpire INTERFACE
$<BUILD_INTERFACE:$<$<NOT:$<LINK_LANGUAGE:Fortran>>:-rdynamic>>

3
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -14,6 +14,8 @@ class Umpire(CMakePackage, CudaPackage):
homepage = 'https://github.com/LLNL/Umpire' homepage = 'https://github.com/LLNL/Umpire'
git = 'https://github.com/LLNL/Umpire.git' git = 'https://github.com/LLNL/Umpire.git'
maintainers = ['davidbeckingsale']
version('develop', branch='develop', submodules='True') version('develop', branch='develop', submodules='True')
version('main', branch='main', submodules='True') version('main', branch='main', submodules='True')
version('4.1.2', tag='v4.1.2', submodules='True') version('4.1.2', tag='v4.1.2', submodules='True')
@ -42,6 +44,7 @@ class Umpire(CMakePackage, CudaPackage):
version('0.1.3', tag='v0.1.3', submodules='True') version('0.1.3', tag='v0.1.3', submodules='True')
patch('camp_target_umpire_3.0.0.patch', when='@3.0.0') patch('camp_target_umpire_3.0.0.patch', when='@3.0.0')
patch('cmake_version_check.patch', when='@4.1.0:main')
variant('fortran', default=False, description='Build C/Fortran API') variant('fortran', default=False, description='Build C/Fortran API')
variant('c', default=True, description='Build C API') variant('c', default=True, description='Build C API')