diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3c3475..05dbef1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,34 @@ cmake_minimum_required(VERSION 2.8)
 enable_testing()
 project(toml11)
 
-include_directories(${PROJECT_SOURCE_DIR})
-add_definitions(-std=c++11)
+include(CheckCXXCompilerFlag)
+if("${CMAKE_VERSION}" VERSION_GREATER 3.1)
+    set(CMAKE_CXX_STANDARD 11)
+    set(CXX_STANDARD_REQUIRED ON)
+else()
+    # Manually check for C++11 compiler flag.
+    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+    CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+    CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_GNU11)
+    CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" COMPILER_SUPPORTS_GNU0X)
+    if(COMPILER_SUPPORTS_CXX11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    elseif(COMPILER_SUPPORTS_CXXOX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+    elseif(COMPILER_SUPPORTS_GNU11)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+    elseif(COMPILER_SUPPORTS_GNU0X)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+    else()
+        if(MSVC)
+            if(MSVC_VERSION LESS 1900)
+                message(SEND_ERROR "MSVC < 14.0 is not supported. Please update your compiler or use mingw")
+            endif()
+        else()
+            message(SEND_ERROR "The ${CMAKE_CXX_COMPILER} compiler lacks C++11 support. Use another compiler.")
+        endif()
+    endif()
+endif()
 
+include_directories(${PROJECT_SOURCE_DIR})
 add_subdirectory(tests)