diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-07 16:48:07 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-07 17:24:30 +0300 |
| commit | ce359a1ae006b588b4427ef8784224a36ada4caf (patch) | |
| tree | 2cafe6790d1a1e766ef4113c20d2a8c03df4312e /project/ci | |
| parent | v2.3 (diff) | |
| download | cmake-common-ce359a1ae006b588b4427ef8784224a36ada4caf.tar.gz cmake-common-ce359a1ae006b588b4427ef8784224a36ada4caf.zip | |
project.toolset: support versioned MSVC toolsets
You can now use something like msvc-141, vs-2017, etc.
Diffstat (limited to 'project/ci')
| -rw-r--r-- | project/ci/boost.py | 2 | ||||
| -rw-r--r-- | project/ci/cmake.py | 2 | ||||
| -rw-r--r-- | project/ci/dirs.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/project/ci/boost.py b/project/ci/boost.py index 8784e19..0d89b75 100644 --- a/project/ci/boost.py +++ b/project/ci/boost.py @@ -59,7 +59,7 @@ def build_ci(dirs, argv=None): configurations=(dirs.get_configuration(),), link=args.link, runtime_link=args.runtime_link, - toolset_hint=dirs.get_toolset(), + toolset_version=dirs.get_toolset(), b2_args=args.b2_args) build(params) diff --git a/project/ci/cmake.py b/project/ci/cmake.py index 9234a39..1f49f78 100644 --- a/project/ci/cmake.py +++ b/project/ci/cmake.py @@ -63,7 +63,7 @@ def build_ci(dirs, argv=None): platform=dirs.get_platform(), configuration=dirs.get_configuration(), boost_dir=boost_dir, - toolset_hint=dirs.get_toolset(), + toolset_version=dirs.get_toolset(), cmake_args=dirs.get_cmake_args() + args.cmake_args) build(params) diff --git a/project/ci/dirs.py b/project/ci/dirs.py index 7e3ce03..eb4651b 100644 --- a/project/ci/dirs.py +++ b/project/ci/dirs.py @@ -11,7 +11,7 @@ from project.boost.version import Version from project.ci.appveyor.generator import Generator, Image from project.configuration import Configuration from project.platform import Platform -from project.toolset import ToolsetHint +from project.toolset import ToolsetVersion from project.utils import env @@ -47,7 +47,7 @@ class Dirs(abc.ABC): @staticmethod def get_toolset(): if 'TOOLSET' in os.environ: - return ToolsetHint.parse(os.environ['TOOLSET']) + return ToolsetVersion.parse(os.environ['TOOLSET']) return None @staticmethod |