diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-08 10:51:50 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-08 14:54:10 +0200 |
| commit | 8e779c062a22a5755cae2c86787e16f59bfe4907 (patch) | |
| tree | dfaa5566eb5813a9d1c029110fb7d8971e2f1dae /bin | |
| parent | 27d1cc61b4f58e8ec25463275bee36c96b66b938 (diff) | |
Centralize VS-to-toolset mapping in configure
This allows to define the mapping once, and avoid modification in
multiple places each time a new VS version support is added
Change-Id: I93de4c9d78c3f67a0a2e157007e9d13b6f557937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123163
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 8e9d8ba157a6..430e4c96cbcc 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -916,7 +916,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): def __init__(self, gbuildparser, ide): IdeIntegrationGenerator.__init__(self, gbuildparser, ide) - self.toolset = self.retrieve_toolset() + self.toolset = os.environ['VCTOOLSET'] self.solution_directory = self.gbuildparser.builddir self.configurations = { 'Build': { @@ -936,10 +936,6 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): } } - def retrieve_toolset(self): - ide_toolset_map = {'160': 'v142', '170': 'v143'} - return ide_toolset_map[os.environ['VCVER']] - def module_make_command(self, targets): return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" %(makecmd)s -rsC %(location)s ' + targets + '"' |