From e2a720930a2cfe28e2f77df6e8447cfafdc6a720 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Thu, 29 Oct 2020 11:32:56 -0700 Subject: Patch CMake version check in Umpire (#19590) * Patch CMake version check in Umpire * Update version constraint for cmake_version_check patch Co-authored-by: Adam J. Stewart * Add maintainers to Umpire Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/umpire/cmake_version_check.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/umpire/package.py | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 var/spack/repos/builtin/packages/umpire/cmake_version_check.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/umpire/cmake_version_check.patch b/var/spack/repos/builtin/packages/umpire/cmake_version_check.patch new file mode 100644 index 0000000000..05f80e0b65 --- /dev/null +++ b/var/spack/repos/builtin/packages/umpire/cmake_version_check.patch @@ -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 + $>:-rdynamic>> diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index c4668e4c6d..08b6d487ff 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -14,6 +14,8 @@ class Umpire(CMakePackage, CudaPackage): homepage = 'https://github.com/LLNL/Umpire' git = 'https://github.com/LLNL/Umpire.git' + maintainers = ['davidbeckingsale'] + version('develop', branch='develop', submodules='True') version('main', branch='main', 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') 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('c', default=True, description='Build C API') -- cgit v1.2.3-60-g2f50