Kaydet (Commit) 83ef294d authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) Tor Lillqvist

Avoid creating duplicates in the Visual Studio IDE integration

When running make vs2013-ide-integration on windows, the manifest
targets cause duplicate library/executable entries to be output in
the Visual Studio solution files, causing errors.

Change-Id: I6b0ce38a3ba84f7f54741e4974264e2c4c7b201a
Reviewed-on: https://gerrit.libreoffice.org/18719Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
Tested-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 2d48830d
...@@ -117,19 +117,21 @@ class GbuildParser: ...@@ -117,19 +117,21 @@ class GbuildParser:
libmatch = GbuildParser.libpattern.match(line) libmatch = GbuildParser.libpattern.match(line)
if libmatch: if libmatch:
libname = self.libnames.get(state.ilib, None) libname = self.libnames.get(state.ilib, None)
self.libs.append( if state.cxxobjects:
GbuildLib(libmatch.group(2), libname, libmatch.group(1), self.libs.append(
state.include, state.include_sys, state.defs, state.cxxobjects, GbuildLib(libmatch.group(2), libname, libmatch.group(1),
state.cxxflags, state.linked_libs)) state.include, state.include_sys, state.defs, state.cxxobjects,
state.cxxflags, state.linked_libs))
state = GbuildParserState() state = GbuildParserState()
return state return state
exematch = GbuildParser.exepattern.match(line) exematch = GbuildParser.exepattern.match(line)
if exematch: if exematch:
exename = self.exenames.get(state.target, None) exename = self.exenames.get(state.target, None)
self.exes.append( if state.cxxobjects:
GbuildExe(exematch.group(2), exename, exematch.group(1), self.exes.append(
state.include, state.include_sys, state.defs, state.cxxobjects, GbuildExe(exematch.group(2), exename, exematch.group(1),
state.cxxflags, state.linked_libs)) state.include, state.include_sys, state.defs, state.cxxobjects,
state.cxxflags, state.linked_libs))
state = GbuildParserState() state = GbuildParserState()
return state return state
if line.find('# INCLUDE :=') == 0: if line.find('# INCLUDE :=') == 0:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment