diff options
| author | Egor Tensin <egor@tensin.name> | 2026-03-29 16:34:21 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-03-29 16:34:21 +0200 |
| commit | aa81d34edc74249962621b6bbd62ba92c42d4e4a (patch) | |
| tree | fac12a9e9f094eb0da3c972397b1ea3f648d34c8 | |
| parent | Merge pull request #7 from egor-tensin/dependabot/github_actions/egor-tensin/... (diff) | |
| download | cmake-common-aa81d34edc74249962621b6bbd62ba92c42d4e4a.tar.gz cmake-common-aa81d34edc74249962621b6bbd62ba92c42d4e4a.zip | |
boost: root/ -> install_dir/
| -rw-r--r-- | .github/actions/check-boost-libraries/action.yml | 2 | ||||
| -rw-r--r-- | project/configuration.py | 2 | ||||
| -rw-r--r-- | project/platform.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.github/actions/check-boost-libraries/action.yml b/.github/actions/check-boost-libraries/action.yml index 02f53f8..b0ad940 100644 --- a/.github/actions/check-boost-libraries/action.yml +++ b/.github/actions/check-boost-libraries/action.yml @@ -27,7 +27,7 @@ runs: $libraries = '${{ inputs.libraries }}' $libraries = $libraries.Split(' ') - $installdir = Join-Path 'root' '${{ inputs.platform }}' '${{ inputs.configuration }}' + $installdir = Join-Path 'install_dir' '${{ inputs.platform }}' '${{ inputs.configuration }}' $librarydir = Join-Path $boost_dir $installdir 'lib' function Get-FileStubs { diff --git a/project/configuration.py b/project/configuration.py index 42dedb3..19a4b3b 100644 --- a/project/configuration.py +++ b/project/configuration.py @@ -34,7 +34,7 @@ class Configuration(Enum): AFAIK, Boost only supports debug/release, MinSizeRel and RelWithDebInfo are hence mapped to "release". The libraries will still reside in - root/PLATFORM/CONFIGURATION/lib, if CONFIGURATION is + install_dir/PLATFORM/CONFIGURATION/lib, if CONFIGURATION is MinSizeRel/RelWithDebInfo. ''' if self in (Configuration.MINSIZEREL, Configuration.RELWITHDEBINFO): diff --git a/project/platform.py b/project/platform.py index 9bd0e58..51dac2c 100644 --- a/project/platform.py +++ b/project/platform.py @@ -81,8 +81,8 @@ class Platform(Enum): if on_windows(): # On Windows, use the host architecture. return Platform.windows_native().installdir(configuration) - # On Linux, the libraries are stored in root/auto/CONFIGURATION/lib. - return os.path.join('root', str(self), str(configuration)) + # On Linux, the libraries are stored in install_dir/auto/CONFIGURATION/lib. + return os.path.join('install_dir', str(self), str(configuration)) def boost_installdir(self, configuration): '''Same as above, but for CMake.''' |