|
Igor Gnatenko |
ef6081 |
From 72e56d63958f323476b16f69ccd38ed09a8fa3e7 Mon Sep 17 00:00:00 2001
|
|
Igor Gnatenko |
ef6081 |
From: David Seifert <soap@gentoo.org>
|
|
Igor Gnatenko |
ef6081 |
Date: Tue, 1 May 2018 14:21:02 +0200
|
|
Igor Gnatenko |
ef6081 |
Subject: [PATCH 14/16] Allow `required : false` for OpenMP dependency
|
|
Igor Gnatenko |
ef6081 |
|
|
Igor Gnatenko |
ef6081 |
* Currently `required : true` is implicitly assumed, making
|
|
Igor Gnatenko |
ef6081 |
optional use of OpenMP not possible.
|
|
Igor Gnatenko |
ef6081 |
---
|
|
Igor Gnatenko |
ef6081 |
mesonbuild/dependencies/misc.py | 8 +++++++-
|
|
Igor Gnatenko |
ef6081 |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
Igor Gnatenko |
ef6081 |
|
|
Igor Gnatenko |
ef6081 |
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
|
|
Igor Gnatenko |
ef6081 |
index d4525b11..cf84123d 100644
|
|
Igor Gnatenko |
ef6081 |
--- a/mesonbuild/dependencies/misc.py
|
|
Igor Gnatenko |
ef6081 |
+++ b/mesonbuild/dependencies/misc.py
|
|
Igor Gnatenko |
ef6081 |
@@ -253,7 +253,13 @@ class OpenMPDependency(ExternalDependency):
|
|
Igor Gnatenko |
ef6081 |
language = kwargs.get('language')
|
|
Igor Gnatenko |
ef6081 |
super().__init__('openmp', environment, language, kwargs)
|
|
Igor Gnatenko |
ef6081 |
self.is_found = False
|
|
Igor Gnatenko |
ef6081 |
- openmp_date = self.compiler.get_define('_OPENMP', '', self.env, [], [self])
|
|
Igor Gnatenko |
ef6081 |
+ try:
|
|
Igor Gnatenko |
ef6081 |
+ openmp_date = self.compiler.get_define('_OPENMP', '', self.env, [], [self])
|
|
Igor Gnatenko |
ef6081 |
+ except mesonlib.EnvironmentException as e:
|
|
Igor Gnatenko |
ef6081 |
+ mlog.debug('OpenMP support not available in the compiler')
|
|
Igor Gnatenko |
ef6081 |
+ mlog.debug(e)
|
|
Igor Gnatenko |
ef6081 |
+ openmp_date = False
|
|
Igor Gnatenko |
ef6081 |
+
|
|
Igor Gnatenko |
ef6081 |
if openmp_date:
|
|
Igor Gnatenko |
ef6081 |
self.version = self.VERSIONS[openmp_date]
|
|
Igor Gnatenko |
ef6081 |
if self.compiler.has_header('omp.h', '', self.env, dependencies=[self]):
|
|
Igor Gnatenko |
ef6081 |
--
|
|
Igor Gnatenko |
ef6081 |
2.17.0
|
|
Igor Gnatenko |
ef6081 |
|