Skip to content
Snippets Groups Projects
Verified Commit b764ce50 authored by Lars Bilke's avatar Lars Bilke
Browse files

Removed --gitlab option.

parent f883b8ca
No related branches found
No related tags found
No related merge requests found
...@@ -108,7 +108,6 @@ Additional options: ...@@ -108,7 +108,6 @@ Additional options:
--gui Builds the GUI (Data Explorer) (default: False) --gui Builds the GUI (Data Explorer) (default: False)
--docs Setup documentation requirements (Doxygen) (default: False) --docs Setup documentation requirements (Doxygen) (default: False)
--jenkins Setup Jenkins slave (default: False) --jenkins Setup Jenkins slave (default: False)
--gitlab Setup for GitLab-CI (default: False)
--cvode Install and configure with cvode (default: False) --cvode Install and configure with cvode (default: False)
--cppcheck Install cppcheck (default: False) --cppcheck Install cppcheck (default: False)
--iwyy Install include-what-you-use (default: False) --iwyy Install include-what-you-use (default: False)
......
...@@ -39,7 +39,7 @@ def main(): # pragma: no cover ...@@ -39,7 +39,7 @@ def main(): # pragma: no cover
cli = Cli_Args() cli = Cli_Args()
args = cli.parse_args() args = cli.parse_args()
if args.jenkins or args.gitlab: if args.jenkins:
args.ogs = ['off'] args.ogs = ['off']
if args.deploy != '': if args.deploy != '':
args.build = True args.build = True
...@@ -256,7 +256,7 @@ def main(): # pragma: no cover ...@@ -256,7 +256,7 @@ def main(): # pragma: no cover
if args.gui: if args.gui:
Stage0 += packages( Stage0 += packages(
apt=[ apt=[
'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev', 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',x
'libxt-dev' 'libxt-dev'
], ],
yum=[ yum=[
...@@ -297,7 +297,6 @@ def main(): # pragma: no cover ...@@ -297,7 +297,6 @@ def main(): # pragma: no cover
# Stage0 += boost(version='1.66.0') # header only? # Stage0 += boost(version='1.66.0') # header only?
Stage0 += packages(apt=['libboost-dev'], yum=['boost-devel'], epel=True) Stage0 += packages(apt=['libboost-dev'], yum=['boost-devel'], epel=True)
# Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'}) # Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
Stage0 += eigen()
vtk_cmake_args = [ vtk_cmake_args = [
'-DModule_vtkIOXML=ON', '-DModule_vtkIOXML=ON',
'-DVTK_Group_Rendering=OFF', '-DVTK_Group_Rendering=OFF',
...@@ -337,6 +336,7 @@ def main(): # pragma: no cover ...@@ -337,6 +336,7 @@ def main(): # pragma: no cover
ldconfig=True) ldconfig=True)
if ompi != 'off': if ompi != 'off':
Stage0 += petsc(version='3.11.3', ldconfig=True) Stage0 += petsc(version='3.11.3', ldconfig=True)
Stage0 += eigen(version='3.3.7')
if args.cvode: if args.cvode:
Stage0 += cvode() Stage0 += cvode()
if args.cppcheck: if args.cppcheck:
......
...@@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser): ...@@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser):
dest='jenkins', dest='jenkins',
action='store_true', action='store_true',
help='Setup Jenkins slave') help='Setup Jenkins slave')
switches_g.add_argument('--gitlab',
dest='gitlab',
action='store_true',
help='Setup for GitLab-CI')
switches_g.add_argument('--cvode', switches_g.add_argument('--cvode',
dest='cvode', dest='cvode',
action='store_true', action='store_true',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment