summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-11-24 21:34:19 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-11-24 21:34:19 -0800
commitbe834300a31ffac837b6434650c206aa8e292e1b (patch)
treec6353469918635bd2a08b1c8b83074f8e3a67b00 /src/CMakeLists.txt
parent6bd809b6b4836e1026998c2d4c1fc76506de3e8f (diff)
parent9de6890f11cf6d1947132bbf90e3735aabb0a683 (diff)
Merge pull request #218 from nwellnhof/windows_fixes
Windows fixes
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71f45a7..f71f09c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,13 +121,14 @@ if(MSVC)
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
endif()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127 /wd4244 /wd4267 /wd4706 /wd4800 /D_CRT_SECURE_NO_WARNINGS")
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=c99 -pedantic")
endif()
# Compile as C++ under MSVC
if(MSVC)
- set(CMAKE_C_FLAGS "/TP")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
endif()
if($ENV{TIMER})