summaryrefslogtreecommitdiffhomepage
path: root/cmake/msvc.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/msvc.cmake')
-rw-r--r--cmake/msvc.cmake23
1 files changed, 9 insertions, 14 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 651d8075..7275badf 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -18,23 +18,18 @@ set(cc "${cc} -FS -arch:SSE2 -D_HAS_EXCEPTIONS=0")
#set(cc "${cc} -Qvec-report:1")
set(warns_ "")
+
+#C4457: declaration of 'id' hides function parameter
+#C4456: declaration of 'i' hides previous local declaration
+#C4263 - member function does not override any base class virtual member function
+#C4264 - no override available for virtual member function from base class, function is hidden
+#C4265 - class has virtual functions, but destructor is not virtual
+#C4266 - no override available for virtual member function from base type, function is hidden
+#C4928 - illegal copy-initialization, more than one user-defined conversion has been implicitly applied
set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251 4100 4702 4457)
if(CMAKE_PROJECT_NAME STREQUAL "opentrack")
include("${CMAKE_CURRENT_LIST_DIR}/opentrack-policy.cmake" NO_POLICY_SCOPE)
- #C4457: declaration of 'id' hides function parameter
- #C4456: declaration of 'i' hides previous local declaration
- #C4263 - member function does not override any base class virtual member function
- #C4264 - no override available for virtual member function from base class, function is hidden
- #C4265 - class has virtual functions, but destructor is not virtual
- #C4266 - no override available for virtual member function from base type, function is hidden
- #C4928 - illegal copy-initialization, more than one user-defined conversion has been implicitly applied
-
- foreach(k CMP0020 CMP0022 CMP0058 CMP0028 CMP0042 CMP0063 CMP0053 CMP0011 CMP0054 CMP0012)
- if(POLICY ${k})
- cmake_policy(SET ${k} NEW)
- endif()
- endforeach()
# C4265: class has virtual functions, but destructor is not virtual
set(warns 4265)
@@ -58,7 +53,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack")
set(CMAKE_RC_FLAGS "/nologo /DWIN32")
endif()
-set(base-cflags "-MT -Zi -Zf -Zo -W4 -Zo -bigobj -cgthreads1 -diagnostics:caret ${warns_}")
+set(base-cflags "-MT -Zi -Zf -Zo -W4 -bigobj -cgthreads1 -diagnostics:caret ${warns_}")
#set(base-cflags "${base-cflags} -d2cgsummary")
set(_CFLAGS "${base-cflags}")