diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-06-13 19:00:37 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-06-13 19:00:37 +0000 |
| commit | 95a77adfeb8f97d2a61956e2eda12afe7371f1db (patch) | |
| tree | 800a32dcfa5f87dcd0d6735b57d1c72e14305d5f /cmake | |
| parent | 86554039f1bc9e84c9e4e22a5af5d2b396fef5a0 (diff) | |
| download | googletest-95a77adfeb8f97d2a61956e2eda12afe7371f1db.tar.gz | |
Fixes broken build on VC++ 7.1.
git-svn-id: http://googletest.googlecode.com/svn/trunk@584 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/internal_utils.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/internal_utils.cmake b/cmake/internal_utils.cmake index 7efc2ac..0561db4 100644 --- a/cmake/internal_utils.cmake +++ b/cmake/internal_utils.cmake @@ -56,6 +56,16 @@ macro(config_compiler_and_linker) # Newlines inside flags variables break CMake's NMake generator. # TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. set(cxx_base_flags "-GS -W4 -WX -wd4127 -wd4251 -wd4275 -nologo -J -Zi") + if (MSVC_VERSION LESS 1400) + # Suppress spurious warnings MSVC 7.1 sometimes issues. + # Forcing value to bool. + set(cxx_base_flags "${cxx_base_flags} -wd4800") + # Copy constructor and assignment operator could not be generated. + set(cxx_base_flags "${cxx_base_flags} -wd4511 -wd4512") + # Compatibility warnings not applicable to Google Test. + # Resolved overload was found by argument-dependent lookup. + set(cxx_base_flags "${cxx_base_flags} -wd4675") + endif() set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") |