Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Olena
pylene
Commits
cdd0912b
Commit
cdd0912b
authored
Jun 16, 2020
by
Edwin Carlinet
Browse files
Make benchmark a build dependancy in conan.
parent
1dfc219f
Changes
1
Hide whitespace changes
Inline
Side-by-side
conanfile.py
View file @
cdd0912b
...
...
@@ -11,13 +11,11 @@ class Pylene(ConanFile):
options
=
{
"shared"
:
[
True
,
False
],
"fPIC"
:
[
True
,
False
],
"benchmark"
:
[
True
,
False
],
"freeimage"
:
[
True
,
False
],
"boost"
:
[
True
,
False
]}
default_options
=
{
"shared"
:
False
,
"fPIC"
:
False
,
"benchmark"
:
False
,
"freeimage"
:
False
,
"boost"
:
False
,
"gtest:shared"
:
False
...
...
@@ -44,6 +42,7 @@ class Pylene(ConanFile):
# developer dependancies (to be removed)
def
build_requirements
(
self
):
self
.
build_requires
(
"gtest/[>=1.10]"
,
force_host_context
=
True
)
self
.
build_requires
(
"benchmark/[>=1.5.0]"
,
force_host_context
=
True
)
# Requirements part of the INTERFACE
...
...
@@ -55,8 +54,5 @@ class Pylene(ConanFile):
if
self
.
options
.
freeimage
:
self
.
requires
(
"freeimage/3.18.0@dutiona/stable"
)
if
self
.
options
.
benchmark
:
self
.
requires
(
"benchmark/1.5.0"
)
if
self
.
options
.
boost
:
self
.
requires
(
"boost/1.69.0@conan/stable"
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment