diff options
| author | Egor Tensin <egor@tensin.name> | 2026-02-02 16:43:34 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-02-02 17:29:41 +0100 |
| commit | 0397f96b14dc3ad80bcc5e3502d15e221e9751e9 (patch) | |
| tree | a01cb17d6095cd47c13b15de20768e8fb4ad3d6b | |
| parent | workflows/example_toolsets: comment out symbol checks temporarily (diff) | |
| download | cmake-common-0397f96b14dc3ad80bcc5e3502d15e221e9751e9.tar.gz cmake-common-0397f96b14dc3ad80bcc5e3502d15e221e9751e9.zip | |
project.build: make arguments sane
| -rw-r--r-- | .github/actions/build-example/action.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/boost_toolsets.yml | 2 | ||||
| -rw-r--r-- | project/build.py | 24 |
3 files changed, 11 insertions, 22 deletions
diff --git a/.github/actions/build-example/action.yml b/.github/actions/build-example/action.yml index 7a77582..9909398 100644 --- a/.github/actions/build-example/action.yml +++ b/.github/actions/build-example/action.yml @@ -19,9 +19,6 @@ inputs: description: Configuration to build required: false default: Debug - cmake-args: - description: Additional CMake arguments - required: false outputs: install-dir: description: Installation directory @@ -57,7 +54,7 @@ runs: $args += '--boost',$boost_dir } - $args += '--',$src_dir,'TMP' + $args += '--',$src_dir $env:VERBOSE = 1 - & $python -m project.build $args ${{ inputs.cmake-args }} + & $python -m project.build $args shell: pwsh diff --git a/.github/workflows/boost_toolsets.yml b/.github/workflows/boost_toolsets.yml index c3131d4..4bf4045 100644 --- a/.github/workflows/boost_toolsets.yml +++ b/.github/workflows/boost_toolsets.yml @@ -155,8 +155,6 @@ jobs: toolset: '${{ matrix.toolset }}' platform: '${{ matrix.platform }}' configuration: '${{ matrix.configuration }}' - # Older Boosts don't like the newer standards (auto_ptr, etc.) - cmake-args: -D CC_CXX_STANDARD=14 - name: Verify runtime library linkage uses: ./.github/actions/check-runtime-library diff --git a/project/build.py b/project/build.py index bc9a8d9..ec5d242 100644 --- a/project/build.py +++ b/project/build.py @@ -135,14 +135,13 @@ class BuildPhase: class BuildParameters: - BUILD_DIR_TMP_PLACEHOLDER = 'TMP' - def __init__(self, src_dir, build_dir, install_dir=None, platform=None, configuration=None, boost_dir=None, toolset_version=None, cmake_args=None): src_dir = normalize_path(src_dir) - build_dir = self.normalize_build_dir(build_dir) + if build_dir is not None: + build_dir = normalize_path(build_dir) if install_dir is not None: install_dir = normalize_path(install_dir) platform = platform or DEFAULT_PLATFORM @@ -167,15 +166,9 @@ class BuildParameters: args.pop('help_toolsets', None) return BuildParameters(**args) - @staticmethod - def normalize_build_dir(build_dir): - if build_dir == BuildParameters.BUILD_DIR_TMP_PLACEHOLDER: - return build_dir - return normalize_path(build_dir) - @contextmanager def create_build_dir(self): - if self.build_dir != BuildParameters.BUILD_DIR_TMP_PLACEHOLDER: + if self.build_dir is not None: logging.info('Build directory: %s', self.build_dir) mkdir_parent(self.build_dir) yield self.build_dir @@ -187,7 +180,6 @@ class BuildParameters: yield build_dir finally: logging.info('Removing build directory: %s', build_dir) - return def build(params): @@ -244,12 +236,14 @@ def _parse_args(argv=None): parser.add_argument('--help-toolsets', action='store_true', help='show detailed info about supported toolsets') + parser.add_argument('--cmake-arg', metavar='ARG', dest='cmake_args', + action='extend', nargs='*', + help='additional CMake arguments, to be passed verbatim') + parser.add_argument('src_dir', type=normalize_path, help='source directory') - parser.add_argument('build_dir', type=BuildParameters.normalize_build_dir, - help=f"build directory ('{BuildParameters.BUILD_DIR_TMP_PLACEHOLDER}' to use a temporary directory)") - parser.add_argument('cmake_args', nargs='*', default=[], - help='additional CMake arguments, to be passed verbatim') + parser.add_argument('build_dir', type=normalize_path, nargs='?', + help=f"build directory (a temporary directory if omitted)") return parser.parse_args(argv) |