diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-23 15:23:21 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-23 15:23:21 +0300 |
commit | 1333ceca043ea81f421cee2d37011622058a16e3 (patch) | |
tree | 9be636c6a40148d975cc719c1581cb2af0cb8685 /CMakeLists.txt | |
parent | 5a05aff73a922f0fdb1a2ea4edb8d139f4ff8d98 (diff) | |
parent | 01f5601fe5aee395676ecc743c1b8a48b366f404 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2961aafe908..0d79ab2ed90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1555,7 +1555,11 @@ if(WITH_PYTHON) endif() if(WITH_CXX11) - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + if( + CMAKE_COMPILER_IS_GNUCC OR + CMAKE_C_COMPILER_ID MATCHES "Clang" OR + CMAKE_C_COMPILER_ID MATCHES "Intel" + ) # TODO(sergey): Do we want c++11 or gnu-c++11 here? set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") elseif(MSVC) |