diff cmake/IrccdSystem.cmake @ 138:ff26bd33a45d

CMake: improve VS2015 support, #425
author David Demelier <markand@malikania.fr>
date Thu, 19 May 2016 13:00:00 +0200
parents bc291b131f6a
children c1acfacc46bd
line wrap: on
line diff
--- a/cmake/IrccdSystem.cmake	Thu May 19 12:52:00 2016 +0200
+++ b/cmake/IrccdSystem.cmake	Thu May 19 13:00:00 2016 +0200
@@ -54,14 +54,15 @@
 	else ()
 		set(CMAKE_CXX_FLAGS "-Wall -Wextra -std=c++14 ${CMAKE_CXX_FLAGS}")
 	endif ()
+elseif (MSVC14)
+	set(CMAKE_C_FLAGS "/DWIN32_LEAN_AND_MEAN /DNOMINMAX /wd4267 /wd48000 /D_CRT_SECURE_NO_WARNINGS ${CMAKE_C_FLAGS}")
+	set(CMAKE_CXX_FLAGS "/DWIN32_LEAN_AND_MEAN /DNOMINMAX /wd4267 /wd4800 /D_CRT_SECURE_NO_WARNINGS /EHsc ${CMAKE_CXX_FLAGS}")
 else ()
 	message(WARNING "Unsupported ${CMAKE_CXX_COMPILER_ID}, may not build correctly.")
 endif ()
 
 if (MINGW)
 	set(CMAKE_CXX_FLAGS "-D_WIN32_WINNT=0x0600 ${CMAKE_CXX_FLAGS}")
-elseif (MSVC)
-	set(CMAKE_CXX_FLAGS "/DWIN32_LEAN_AND_MEAN /DNOMINMAX /D_CRT_SECURE_NO_WARNINGS /EHsc")
 endif ()
 
 if (CMAKE_SIZEOF_VOID_P MATCHES "8")