diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-07 00:28:54 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-07 00:30:52 +0300 |
| commit | 3c1a1e22abf2b9f4406b7fd2d4c9a526c58524b4 (patch) | |
| tree | 8a9da4ca434de66b6c56431fb374737ae5c86782 /project/cmake/build.py | |
| parent | brush up import lists (diff) | |
| download | cmake-common-3c1a1e22abf2b9f4406b7fd2d4c9a526c58524b4.tar.gz cmake-common-3c1a1e22abf2b9f4406b7fd2d4c9a526c58524b4.zip | |
project.cmake.toolset: rework a bit
Bring it more in line with project.boost.toolset + simplify. This
continues the preparation for the merging of the 3 different toolset
modules.
Diffstat (limited to 'project/cmake/build.py')
| -rw-r--r-- | project/cmake/build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/cmake/build.py b/project/cmake/build.py index 7cac5e0..6c5c68c 100644 --- a/project/cmake/build.py +++ b/project/cmake/build.py @@ -72,7 +72,7 @@ class GenerationPhase: def _cmake_args(self, toolset): result = [] - result += toolset.cmake_args() + result += toolset.cmake_args(self.build_dir, self.platform) result += self.configuration.cmake_args() result += self._cmake_boost_args() result += self.cmake_args @@ -179,7 +179,7 @@ class BuildParameters: def build(params): with params.create_build_dir() as build_dir: - toolset = Toolset.detect(params.toolset_hint, params.platform, build_dir) + toolset = Toolset.make(params.toolset_hint, params.platform) gen_phase = GenerationPhase(params.src_dir, build_dir, install_dir=params.install_dir, |