diff --git a/README.md b/README.md index fca26d05591a02dab0f3ea8ab254e4cf10b71f0c..5b974f7932a07c0a8ad57315d50c4d4571754039 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,6 @@ Additional options: --gui Builds the GUI (Data Explorer) (default: False) --docs Setup documentation requirements (Doxygen) (default: False) --jenkins Setup Jenkins slave (default: False) - --gitlab Setup for GitLab-CI (default: False) --cvode Install and configure with cvode (default: False) --cppcheck Install cppcheck (default: False) --iwyy Install include-what-you-use (default: False) diff --git a/ogscm/cli.py b/ogscm/cli.py index 966b7e2b366da3a4f970996f8b728a0f6d4066c2..31d971164d99e54aafa2387f990384bae690a354 100644 --- a/ogscm/cli.py +++ b/ogscm/cli.py @@ -39,7 +39,7 @@ def main(): # pragma: no cover cli = Cli_Args() args = cli.parse_args() - if args.jenkins or args.gitlab: + if args.jenkins: args.ogs = ['off'] if args.deploy != '': args.build = True @@ -256,7 +256,7 @@ def main(): # pragma: no cover if args.gui: Stage0 += packages( apt=[ - 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev', + 'mesa-common-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev',x 'libxt-dev' ], yum=[ @@ -297,7 +297,6 @@ def main(): # pragma: no cover # Stage0 += boost(version='1.66.0') # header only? Stage0 += packages(apt=['libboost-dev'], yum=['boost-devel'], epel=True) # Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'}) - Stage0 += eigen() vtk_cmake_args = [ '-DModule_vtkIOXML=ON', '-DVTK_Group_Rendering=OFF', @@ -337,6 +336,7 @@ def main(): # pragma: no cover ldconfig=True) if ompi != 'off': Stage0 += petsc(version='3.11.3', ldconfig=True) + Stage0 += eigen(version='3.3.7') if args.cvode: Stage0 += cvode() if args.cppcheck: diff --git a/ogscm/cli_args.py b/ogscm/cli_args.py index e3189d5703be9ee2e1574170721a6cb8881aff90..3d519489d0f717269c8a1704dc55d3b9abb96a84 100644 --- a/ogscm/cli_args.py +++ b/ogscm/cli_args.py @@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser): dest='jenkins', action='store_true', help='Setup Jenkins slave') - switches_g.add_argument('--gitlab', - dest='gitlab', - action='store_true', - help='Setup for GitLab-CI') switches_g.add_argument('--cvode', dest='cvode', action='store_true',