Merge pull request #518 from theSundayProgrammer/master

use MSVC14
2016-02-08 14:14:17 -08:00
parent 2a57029983 1a0234fd8a
commit ca54300295
1 changed files with 1 additions and 1 deletions
@@ -26,7 +26,7 @@
 macro(check_for_cxx11_compiler _VAR)
    message(STATUS "Checking for C++11 compiler")
    set(${_VAR})
-    if((MSVC AND (MSVC10 OR MSVC11 OR MSVC12)) OR
+    if((MSVC AND (MSVC10 OR MSVC11 OR MSVC12 OR MSVC14)) OR
       (CMAKE_COMPILER_IS_GNUCXX AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.6) OR
       (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.1) OR
       (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 12.0))