diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2015-09-19 16:59:45 -0400 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-09-20 06:44:21 +0000 |
| commit | 83ef294dddf3b1ab5cd5f91a792a7d9413a08f1f (patch) | |
| tree | 0a2d45552272d6f096e3499c82460e54233cb96b /bin | |
| parent | 2d48830dcbe14c9c2789707d1032876c45409799 (diff) | |
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/18719
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index de0a06009188..953747e204ef 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -117,19 +117,21 @@ class GbuildParser: libmatch = GbuildParser.libpattern.match(line) if libmatch: libname = self.libnames.get(state.ilib, None) - self.libs.append( - GbuildLib(libmatch.group(2), libname, libmatch.group(1), - state.include, state.include_sys, state.defs, state.cxxobjects, - state.cxxflags, state.linked_libs)) + if state.cxxobjects: + self.libs.append( + GbuildLib(libmatch.group(2), libname, libmatch.group(1), + state.include, state.include_sys, state.defs, state.cxxobjects, + state.cxxflags, state.linked_libs)) state = GbuildParserState() return state exematch = GbuildParser.exepattern.match(line) if exematch: exename = self.exenames.get(state.target, None) - self.exes.append( - GbuildExe(exematch.group(2), exename, exematch.group(1), - state.include, state.include_sys, state.defs, state.cxxobjects, - state.cxxflags, state.linked_libs)) + if state.cxxobjects: + self.exes.append( + GbuildExe(exematch.group(2), exename, exematch.group(1), + state.include, state.include_sys, state.defs, state.cxxobjects, + state.cxxflags, state.linked_libs)) state = GbuildParserState() return state if line.find('# INCLUDE :=') == 0: |