diff --git a/Build.py b/Build.py index c4882ce1..ec3a902a 100644 --- a/Build.py +++ b/Build.py @@ -20,7 +20,7 @@ def get_preset(): return preset def build(preset): - cmd=f"cmake --preset {preset}".split() + cmd=f"cmake --preset {preset} --fresh".split() subprocess.check_call(cmd) cmd=f"cmake --build --preset {preset}".split() @@ -28,8 +28,13 @@ def build(preset): def main(): + opts = Setup.parse_arguments() Setup.setup_profiles() - Setup.conan_install_all(Setup.BuildMode.release,build_missing=True) + Setup.conan_install_all(Setup.BuildMode.release, + opts.options if opts.options is not None else [], + build_missing=True, + custom_profile=opts.profile + ) build(get_preset()) if __name__ == "__main__": diff --git a/CMakeLists.txt b/CMakeLists.txt index 69312602..6cd0def3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.23) project( BSMPT - VERSION 3.0.5 + VERSION 3.0.6 LANGUAGES C CXX DESCRIPTION "BSMPT - Beyond the Standard Model Phase Transitions : A C++ package for the computation of the EWPT in BSM models" diff --git a/README.md b/README.md index ba6b5960..299b8e9a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2021 Philipp Basler, Margarete Mühlleitner and Jonas M SPDX-License-Identifier: GPL-3.0-or-later --> -Program: BSMPT version 3.0.5 +Program: BSMPT version 3.0.6 Released by: Philipp Basler, Lisa Biermann, Margarete Mühlleitner, Jonas Müller, Rui Santos and João Viana diff --git a/Setup.py b/Setup.py index a9129e57..d84fc202 100644 --- a/Setup.py +++ b/Setup.py @@ -187,8 +187,7 @@ def __str__(self): return self.name -if __name__ == "__main__": - +def parse_arguments(): parser = ArgumentParser() parser.add_argument( "--mode", @@ -202,6 +201,7 @@ def __str__(self): "--options", "-o", nargs="+", + action="extend", help="Options to pass through to conan. For the available options please look into the conanfile.", ) parser.add_argument( @@ -216,7 +216,12 @@ def __str__(self): default="", ) - opts = parser.parse_args() + return parser.parse_args() + + +if __name__ == "__main__": + + opts = parse_arguments() setup_profiles() conan_install_all( opts.mode,