aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/project/ci
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-05-06 23:49:46 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-05-06 23:49:46 +0300
commitaddd6ff33184614c6ad191436d34ea7528b17878 (patch)
tree34a8efb72bfb266f9ab47d65522883eaac6e70a6 /project/ci
parent"toolchain" -> "toolset", part 1 (diff)
downloadcmake-common-addd6ff33184614c6ad191436d34ea7528b17878.tar.gz
cmake-common-addd6ff33184614c6ad191436d34ea7528b17878.zip
"toolchain" -> "toolset", part 2
Diffstat (limited to '')
-rw-r--r--project/ci/boost.py2
-rw-r--r--project/ci/cmake.py2
-rw-r--r--project/ci/dirs.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/project/ci/boost.py b/project/ci/boost.py
index 6861603..8784e19 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=dirs.get_toolset(),
+ toolset_hint=dirs.get_toolset(),
b2_args=args.b2_args)
build(params)
diff --git a/project/ci/cmake.py b/project/ci/cmake.py
index dbe31f6..9234a39 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=dirs.get_toolset(),
+ toolset_hint=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 6804ff4..7e3ce03 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 ToolchainType
+from project.toolset import ToolsetHint
from project.utils import env
@@ -47,7 +47,7 @@ class Dirs(abc.ABC):
@staticmethod
def get_toolset():
if 'TOOLSET' in os.environ:
- return ToolchainType.parse(os.environ['TOOLSET'])
+ return ToolsetHint.parse(os.environ['TOOLSET'])
return None
@staticmethod