MSVC11 needs PCH objects added to the link line.

Update msvc linker emitter to add the PCH object if not already present.

1 files changed, 85 insertions, 85 deletions

diff --git a/test/MSVC/pch-spaces-subdir.py b/test/MSVC/pch-spaces-subdir.py
index 90d3b51..991627f 100644
--- a/test/MSVC/pch-spaces-subdir.py
+++ b/test/MSVC/pch-spaces-subdir.py
@@ -1,85 +1,85 @@
-#!/usr/bin/env python

-#

-# __COPYRIGHT__

-#

-# Permission is hereby granted, free of charge, to any person obtaining

-# a copy of this software and associated documentation files (the

-# "Software"), to deal in the Software without restriction, including

-# without limitation the rights to use, copy, modify, merge, publish,

-# distribute, sublicense, and/or sell copies of the Software, and to

-# permit persons to whom the Software is furnished to do so, subject to

-# the following conditions:

-#

-# The above copyright notice and this permission notice shall be included

-# in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY

-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE

-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-#

-

-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"

-

-"""

-Verify PCH works if variant dir has spaces in its name

-"""

-

-import sys

-import time

-

-import TestSCons

-

-test = TestSCons.TestSCons(match = TestSCons.match_re)

-

-if sys.platform != 'win32':

-    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform

-    test.skip_test(msg)

-

-test.write('Main.cpp', """\

-#include "Precompiled.h"

-

-int main()

-{

-    return testf();

-}

-""")

-

-test.write('Precompiled.cpp', """\

-#include "Precompiled.h"

-""")

-

-test.write('Precompiled.h', """\

-#pragma once

-

-int testf()

-{

-    return 0;

-}

-""")

-

-test.write('SConstruct', """\

-SConscript('SConscript', variant_dir='Release Output', duplicate=0)

-""")

-

-test.write('SConscript', """\

-env = Environment()

-

-env['PCHSTOP'] = 'Precompiled.h'

-env['PCH'] = env.PCH('Precompiled.cpp')[0]

-

-env.Program('Main.cpp')

-""")

-

-test.run(arguments='.', stderr=None)

-

-test.pass_test()

-

-# Local Variables:

-# tab-width:4

-# indent-tabs-mode:nil

-# End:

-# vim: set expandtab tabstop=4 shiftwidth=4:

+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify PCH works if variant dir has spaces in its name
+"""
+
+import sys
+import time
+
+import TestSCons
+
+test = TestSCons.TestSCons(match = TestSCons.match_re)
+
+if sys.platform != 'win32':
+    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
+test.write('Main.cpp', """\
+#include "Precompiled.h"
+
+int main()
+{
+    return testf();
+}
+""")
+
+test.write('Precompiled.cpp', """\
+#include "Precompiled.h"
+""")
+
+test.write('Precompiled.h', """\
+#pragma once
+
+static int testf()
+{
+    return 0;
+}
+""")
+
+test.write('SConstruct', """\
+SConscript('SConscript', variant_dir='Release Output', duplicate=0)
+""")
+
+test.write('SConscript', """\
+env = Environment()
+
+env['PCHSTOP'] = 'Precompiled.h'
+env['PCH'] = env.PCH('Precompiled.cpp')[0]
+
+env.Program('Main.cpp')
+""")
+
+test.run(arguments='.', stderr=None)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: