diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c332a1..ab4dcb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,10 @@ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
 
 # GCC check (needs -std:c++11 flag)
-if(CMAKE_COMPILER_IS_GNUCC)
-	ADD_DEFINITIONS("-std=c++11")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+#if(CMAKE_COMPILER_IS_GNUCC)
+#	ADD_DEFINITIONS("-std=c++11")
+#ENDIF(CMAKE_COMPILER_IS_GNUCC)
+set (CMAKE_CXX_STANDARD 11)
 
 IF(WIN32)
 	# gnuwin32 paths:
@@ -31,6 +32,7 @@ MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
 
 IF(CMAKE_BUILD_TYPE MATCHES "debug")
 	SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
+    ADD_DEFINITIONS(-D_DEBUG=1)
 ENDIF()