svn commit: r1692091 - /subversion/trunk/build/generator/gen_win.py

[rh...@apache.org]

Author: rhuijben
Date: Tue Jul 21 11:44:52 2015
New Revision: 1692091

URL: http://svn.apache.org/r1692091
Log:
In the windows project file generator: Stop adding references to optional
libraries that are hardcoded in build.conf, if the library itself is not
detected.

* build/generator/gen_win.py
  (get_win_depends): Don't add optional dependency libraries, unless the
    optional library is actually found.

Modified:
    subversion/trunk/build/generator/gen_win.py

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1692091&r1=1692090&r2=1692091&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Jul 21 11:44:52 2015
@@ -615,7 +615,10 @@ class WinGeneratorBase(gen_win_dependenc
     elif mode == FILTER_EXTERNALLIBS:
       for dep, (is_proj, is_lib, is_static) in dep_dict.items():
         if is_static or (is_lib and not is_proj):
-          deps.append(dep)
+          # Filter explicit msvc libraries of optional dependencies
+          if (dep.name in self._libraries
+              or dep.name not in self._optional_libraries):
+            deps.append(dep)
     else:
       raise NotImplementedError