Skip to content

Commit

Permalink
Merge pull request easybuilders#19270 from boegel/20231120202513_new_…
Browse files Browse the repository at this point in the history
…pr_pybind112103

avoid indirect dependency on old CMake version built with GCCcore/10.2.0 via Catch2 build dependency using system toolchain in recent pybind11 easyconfigs
  • Loading branch information
verdurin authored Nov 21, 2023
2 parents 547ef5a + fb88533 commit a251edc
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 2 deletions.
30 changes: 30 additions & 0 deletions easybuild/easyconfigs/c/Catch2/Catch2-2.13.9-GCCcore-12.2.0.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
easyblock = 'CMakeMake'

name = 'Catch2'
version = '2.13.9'

homepage = 'https://github.com/catchorg/Catch2'
description = """A modern, C++-native, header-only,
test framework for unit-tests, TDD and BDD
- using C++11, C++14, C++17 and later
"""

toolchain = {'name': 'GCCcore', 'version': '12.2.0'}

source_urls = ['https://github.com/catchorg/Catch2/archive/']
sources = ['v%(version)s.tar.gz']
checksums = ['06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52']

builddependencies = [
('binutils', '2.39'), # to make CMake compiler health check pass on old systems
('CMake', '3.24.3'),
]

separate_build_dir = True

sanity_check_paths = {
'files': [],
'dirs': ['include/catch2', 'lib64/cmake'],
}

moduleclass = 'lib'
30 changes: 30 additions & 0 deletions easybuild/easyconfigs/c/Catch2/Catch2-2.13.9-GCCcore-12.3.0.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
easyblock = 'CMakeMake'

name = 'Catch2'
version = '2.13.9'

homepage = 'https://github.com/catchorg/Catch2'
description = """A modern, C++-native, header-only,
test framework for unit-tests, TDD and BDD
- using C++11, C++14, C++17 and later
"""

toolchain = {'name': 'GCCcore', 'version': '12.3.0'}

source_urls = ['https://github.com/catchorg/Catch2/archive/']
sources = ['v%(version)s.tar.gz']
checksums = ['06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52']

builddependencies = [
('binutils', '2.40'), # to make CMake compiler health check pass on old systems
('CMake', '3.26.3'),
]

separate_build_dir = True

sanity_check_paths = {
'files': [],
'dirs': ['include/catch2', 'lib64/cmake'],
}

moduleclass = 'lib'
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ builddependencies = [
('CMake', '3.24.3'),
# Test dependencies
('Eigen', '3.4.0'),
('Catch2', '2.13.9', '', SYSTEM),
('Catch2', '2.13.9'),
]
dependencies = [('Python', '3.10.8')]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ builddependencies = [
('CMake', '3.26.3'),
# Test dependencies
('Eigen', '3.4.0'),
('Catch2', '2.13.9', '', SYSTEM),
('Catch2', '2.13.9'),
('Python-bundle-PyPI', '2023.06'), # to provide pytest
]
dependencies = [('Python', '3.11.3')]
Expand Down

0 comments on commit a251edc

Please sign in to comment.