diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c1063ba..c8756e90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,15 +50,21 @@ elseif(WIN32)
 endif()
 
 # Define proper compilation flags
-IF (CMAKE_COMPILER_IS_GNUCC)
+IF(MSVC)
+	# Visual Studio:
+	# Maximum optimization
+    set(CMAKE_CXX_FLAGS_RELEASE "/Ox")
+	# Generate complete debugging information
+    #set(CMAKE_CXX_FLAGS_DEBUG "/Zi")
+ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
     # linux/gcc, bsd/gcc, windows/mingw
     set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
     set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
-else()
+ELSE()
     # other: osx/llvm, bsd/llvm
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
     set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ENDIF()
 
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
 IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")