diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-03-23 23:57:05 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-03-24 00:04:22 +0300 |
| commit | 7a48deafe7615392b458681bd23e6136ed20deb6 (patch) | |
| tree | f49550c23d0858632bfc96f614e6d71b90598293 /project/cmake | |
| parent | project.utils: log to stdout, not stderr (diff) | |
| download | cmake-common-7a48deafe7615392b458681bd23e6136ed20deb6.tar.gz cmake-common-7a48deafe7615392b458681bd23e6136ed20deb6.zip | |
project.cmake: set CMAKE_BUILD_PARALLEL_LEVEL
Diffstat (limited to '')
| -rw-r--r-- | project/cmake/build.py | 9 | ||||
| -rw-r--r-- | project/cmake/toolchain.py | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/project/cmake/build.py b/project/cmake/build.py index 9f9bc00..20c823f 100644 --- a/project/cmake/build.py +++ b/project/cmake/build.py @@ -39,8 +39,15 @@ DEFAULT_CONFIGURATION = Configuration.DEBUG DEFAULT_TOOLSET = ToolchainType.AUTO +# This way of basically passing `-j` to make is more universal compared to +# _guessing_ that the build system is make and passing -j explicitly. Plus it +# works with older CMake versions, which don't support the --parallel flag. +cmake_env = os.environ.copy() +cmake_env['CMAKE_BUILD_PARALLEL_LEVEL'] = str(os.cpu_count()) + + def run_cmake(cmake_args): - return run(['cmake'] + cmake_args) + return run(['cmake'] + cmake_args, env=cmake_env) class GenerationPhase: diff --git a/project/cmake/toolchain.py b/project/cmake/toolchain.py index 3311d04..af3da21 100644 --- a/project/cmake/toolchain.py +++ b/project/cmake/toolchain.py @@ -72,7 +72,7 @@ class MSVC(Auto): return ['-A', self.platform.msvc_arch()] def build_system_args(self): - return ['/m'] + return [] class Makefile(Toolchain): |