diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-01-12 06:56:28 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-01-12 06:56:28 +0300 |
| commit | 59bc9a1d514923cf21438292e71e53c2deb9cb7b (patch) | |
| tree | 6d23adc32fd9d53aedda9c64fcaa4bda24e85c55 /CMakeLists.txt | |
| parent | 73c48d7347ee9ca77aff7e558d97130c8eb43f87 (diff) | |
| parent | 092cbcd1d2c31b10af31ce326bdf4efc2819a5fa (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ab5f8a5b42..d61a7de1a33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -874,7 +874,7 @@ endif() # linux only, not cached set(WITH_BINRELOC OFF) -# MAXOSX only, set to avoid uninitialized +# MACOSX only, set to avoid uninitialized set(EXETYPE "") # C/C++ flags @@ -1580,7 +1580,7 @@ if(WITH_CXX11) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") # TODO(sergey): Do we want c++11 or gnu-c++11 here? set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - elseif(MSVC12) + elseif(MSVC) # Nothing special is needed, C++11 features are available by default. else() message(FATAL_ERROR "Compiler ${CMAKE_C_COMPILER_ID} is not supported for C++11 build yet") |