IOT-1583: Adding /W4 and /WX to gtest build.

Making sure any version changes of gtest don't introduce
any level 4 warnings.

Change-Id: I951aee6029d5f48482aea93240f926a82549e5f0
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17345
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/extlibs/gtest/SConscript b/extlibs/gtest/SConscript
index d0ccbae..4b4d384 100644 (file)
--- a/extlibs/gtest/SConscript
+++ b/extlibs/gtest/SConscript
@@ -74,9 +74,13 @@ elif target_os in ['windows']:
        # Avoid building the same StaticLibrary in more than one environment, by using the
        # IOTIVITY_GTEST_HAS_BEEN_BUILT environment variable
        if not env.has_key('IOTIVITY_GTEST_HAS_BEEN_BUILT'):
-               gtest_env.Append(CPPPATH = [ gtest_dir ])
-               gtest = gtest_env.StaticLibrary(target = 'gtest', source = [ '%s/src/gtest-all.cc' % gtest_dir ])
-               gtest_main = gtest_env.StaticLibrary(target = 'gtest_main', source = [ '%s/src/gtest_main.cc' % gtest_dir ])
+               gtest_env.AppendUnique(CPPPATH = [ gtest_dir ])
+               gtest_build_env = gtest_env.Clone()
+               gtest_build_env.AppendUnique(CPPPATH = [ os.path.join(gtest_dir, 'include') ])
+               gtest_build_env.AppendUnique(CXXFLAGS = ['/EHsc'])
+               gtest_build_env.AppendUnique(CCFLAGS = ['/W4', '/WX'])
+               gtest = gtest_build_env.StaticLibrary(target = 'gtest', source = [ '%s/src/gtest-all.cc' % gtest_dir ])
+               gtest_main = gtest_build_env.StaticLibrary(target = 'gtest_main', source = [ '%s/src/gtest_main.cc' % gtest_dir ])
                gtest_env.InstallTarget(gtest, 'gtest')
                gtest_env.InstallTarget(gtest_main, 'gtest_main')