Import 2017-06-07 23:51:09: master 8e326873

Author Committer Branch Timestamp Parent
jcfr jcfr master 2014-02-19 15:02:31 master 9ea13d8a
Changeset

COMP: Tweak msvc9compiler patch to also use with older installation of SDK

While this version allow to compile on modern version of Visual Studio,
it broke the build on older version.

For example, on the dashboard District9, with the following version
installed:
Microsoft Visual Studio 2008
Version 9.0.30729.1 SP
Microsoft .NET Framework
Version 3.5 SP1

It will ensure the following paths are also returned:

include:
C:\Program Files\Microsoft SDKs\Windows\v6.0A\include;
lib:
C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib;
libpath:
c:\WINDOWS\Microsoft.NET\Framework\v3.5;
c:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;
path:
c:\WINDOWS\Microsoft.NET\Framework\v3.5;
c:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;
C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin;

Instead of tweaking the updated "query_vcvarsall", a "dumb" approach
as been considered. The unpatched version of the function has been re-added
as "query_vcvarsall_default" and path discovered by new and original approach
are merged into the same dictionary.

Note that the "query_vcvarsall_default" doesn't raise an exception anymore
if no interesting path are found.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22889 3bd1e089-480b-0410-8dfb-8563597acbee

mod - SuperBuild/python_patched_msvc9compiler.py Diff File