diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-30 01:07:36 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-30 01:07:36 +0300 |
| commit | ef04530c9862d3cb03fcb59e74a8cf551eb84a6a (patch) | |
| tree | 56df1d5462fffa8366e2fa78617e9feabcb3486f | |
| parent | project.build.build: more restrictive defaults (diff) | |
| download | cmake-common-ef04530c9862d3cb03fcb59e74a8cf551eb84a6a.tar.gz cmake-common-ef04530c9862d3cb03fcb59e74a8cf551eb84a6a.zip | |
project.boost: support --mingw for Travis/AppVeyor
| -rw-r--r-- | project/boost/build.py | 12 | ||||
| -rw-r--r-- | project/ci/appveyor/boost.py | 3 | ||||
| -rw-r--r-- | project/ci/travis/boost.py | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/project/boost/build.py b/project/boost/build.py index fdcf050..1e5018e 100644 --- a/project/boost/build.py +++ b/project/boost/build.py @@ -49,7 +49,7 @@ COMMON_B2_ARGS = ['-d0'] class BuildParameters: def __init__(self, boost_dir, build_dir=None, platforms=None, configurations=None, link=None, runtime_link=None, - b2_args=None, mingw=False): + mingw=False, b2_args=None): boost_dir = project.utils.normalize_path(boost_dir) if build_dir is not None: @@ -64,14 +64,14 @@ class BuildParameters: b2_args = COMMON_B2_ARGS self.boost_dir = boost_dir - self.stage_dir = 'stage' self.build_dir = build_dir + self.stage_dir = 'stage' self.platforms = platforms self.configurations = configurations self.link = link self.runtime_link = runtime_link - self.b2_args = b2_args self.mingw = mingw + self.b2_args = b2_args @staticmethod def from_args(args): @@ -192,6 +192,9 @@ def _parse_args(argv=None): type=Linkage.parse, default=DEFAULT_RUNTIME_LINK, help=f'how the libraries link to the runtime ({linkage_options})') + parser.add_argument('--mingw', action='store_true', + help='build using MinGW-w64') + parser.add_argument('--build', metavar='DIR', dest='build_dir', type=project.utils.normalize_path, help='Boost build directory (temporary directory unless specified)') @@ -203,9 +206,6 @@ def _parse_args(argv=None): nargs='*', default=[], help='additional b2 arguments, to be passed verbatim') - parser.add_argument('--mingw', action='store_true', - help='build using MinGW-w64') - return parser.parse_args(argv) diff --git a/project/ci/appveyor/boost.py b/project/ci/appveyor/boost.py index 875d681..cfaa10c 100644 --- a/project/ci/appveyor/boost.py +++ b/project/ci/appveyor/boost.py @@ -74,6 +74,8 @@ def _parse_args(argv=None): parser.add_argument('--runtime-link', metavar='LINKAGE', type=Linkage.parse, help='how the libraries link to the runtime') + parser.add_argument('--mingw', action='store_true', + help='build using MinGW-w64') parser.add_argument('b2_args', metavar='B2_ARG', nargs='*', default=[], help='additional b2 arguments, to be passed verbatim') @@ -98,6 +100,7 @@ def build_appveyor(argv=None): configurations=(_get_configuration(),), link=args.link, runtime_link=args.runtime_link, + mingw=args.mingw, b2_args=args.b2_args) build(params) diff --git a/project/ci/travis/boost.py b/project/ci/travis/boost.py index 0830544..80ed01c 100644 --- a/project/ci/travis/boost.py +++ b/project/ci/travis/boost.py @@ -72,6 +72,8 @@ def _parse_args(argv=None): parser.add_argument('--runtime-link', metavar='LINKAGE', type=Linkage.parse, help='how the libraries link to the runtime') + parser.add_argument('--mingw', action='store_true', + help='build using MinGW-w64') parser.add_argument('b2_args', metavar='B2_ARG', nargs='*', default=[], help='additional b2 arguments, to be passed verbatim') @@ -96,6 +98,7 @@ def build_travis(argv=None): configurations=(_get_configuration(),), link=args.link, runtime_link=args.runtime_link, + mingw=args.mingw, b2_args=args.b2_args) build(params) |