diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-30 12:47:46 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-30 17:16:05 +0200 |
| commit | 80d071f834b13c73b14335ed6298daf895aecdb3 (patch) | |
| tree | 71a1fd21f882a7661e876709392e587043305312 /bin | |
| parent | c00948d9bd35dfb15a331c2163f32e9ee24644fd (diff) | |
Upgrade to vs2017-ide-integration, since we don't support VS2015 in master
This allows to avoid the "(Visual Studio 2015)" labels next to project
names in Solution Explorer; and also avoid multiple warnilgs like
project-name.vcxproj : warning : The build tools for Visual Studio
2015 (v140) cannot be found. Install Visual Studio 2015 (v140) to
build using the Visual Studio 2015 (v140) build tools.
in IDE's Output pane in case VS2015 is absent locally.
Change-Id: I53b68ac810cbf2a31667c35dd549310e7209e010
Reviewed-on: https://gerrit.libreoffice.org/59797
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 9ac6949ffec8..14409b5490b9 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -744,7 +744,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): } def retrieve_toolset(self, ide): - ide_toolset_map = {'vs2015': 'v140'} + ide_toolset_map = {'vs2017': 'v141'} return ide_toolset_map[ide] def module_make_command(self, targets): @@ -879,7 +879,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): # Type of project used by the MSBuild to determine build process, see Microsoft.Makefile.targets conf_type_node = ET.SubElement(conf_node, '{%s}ConfigurationType' % ns) conf_type_node.text = 'Makefile' - # VS2012: I need to have this otherwise the names of projects will contain text Visual Studio 2010 in the Solution Explorer + # This defines the version of Visual Studio which can show next to project names in the Solution Explorer platform_toolset_node = ET.SubElement(conf_node, '{%s}PlatformToolset' % ns) platform_toolset_node.text = self.toolset @@ -1651,7 +1651,7 @@ if __name__ == '__main__': 'eclipsecdt': EclipseCDTIntegrationGenerator, 'kdevelop': KdevelopIntegrationGenerator, 'xcode': XcodeIntegrationGenerator, - 'vs2015': VisualStudioIntegrationGenerator, + 'vs2017': VisualStudioIntegrationGenerator, 'vim': VimIntegrationGenerator, 'debug': DebugIntegrationGenerator, 'qtcreator': QtCreatorIntegrationGenerator, |