diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ace01..e14eb95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,13 @@ cmake_minimum_required(VERSION 2.9)
 set(GAME_NAME battleship)
 project(${GAME_NAME})
 
+if(MSVC)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std:c++17")
+else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pedantic")
+endif()
+
 set(CMAKE_CXX_STANDART 17)
-set(CMAKE_CXX_FLAGS "-std=c++17 -Wpedantic")
 set(CMAKE_BUILD_TYPE Debug)
 set(BUILD_TESTS OFF)
 set(BUILD_SHARED_LIBS OFF CACHE BOOL FORCED)