aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/project/ci/cmake.py
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-01-25 12:24:09 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-01-25 12:32:43 +0300
commitb265ab254b23edca357fcecbd0afade26d5a66ac (patch)
tree4395624af00d71dc43ff3bfe2d65e37f39798037 /project/ci/cmake.py
parentREADME: update (diff)
downloadcmake-common-b265ab254b23edca357fcecbd0afade26d5a66ac.tar.gz
cmake-common-b265ab254b23edca357fcecbd0afade26d5a66ac.zip
project.ci: auto-fill --toolset from environment
Diffstat (limited to '')
-rw-r--r--project/ci/cmake.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/project/ci/cmake.py b/project/ci/cmake.py
index ff21873..6635dbf 100644
--- a/project/ci/cmake.py
+++ b/project/ci/cmake.py
@@ -10,7 +10,6 @@ import sys
from project.ci.dirs import Dirs
from project.cmake.build import BuildParameters, build
-from project.toolchain import ToolchainType
from project.utils import setup_logging
@@ -27,9 +26,6 @@ def _parse_args(argv=None):
help='install the project')
parser.add_argument('--boost', metavar='DIR', dest='boost_dir',
help='set Boost directory path')
- parser.add_argument('--toolset', metavar='TOOLSET',
- type=ToolchainType.parse,
- help='toolset to use')
parser.add_argument('--subdir', metavar='DIR',
help='relative project directory path')
parser.add_argument('cmake_args', nargs='*', metavar='CMAKE_ARG', default=[],
@@ -53,7 +49,7 @@ def build_ci(dirs, argv=None):
platform=dirs.get_platform(),
configuration=dirs.get_configuration(),
boost_dir=args.boost_dir or dirs.get_boost_dir(),
- toolset=args.toolset,
+ toolset=dirs.get_toolset(),
cmake_args=dirs.get_cmake_args() + args.cmake_args)
build(params)