diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 09:13:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-06 09:13:36 +0400 |
| commit | 68fd1865869a1c830e93af1f5f05d429407ea026 (patch) | |
| tree | f6b8e50af387c5dc91e30298c51024f3fa417cbe /CMakeLists.txt | |
| parent | f6c5744b01fa368dbc47ac19cb826e125cc34499 (diff) | |
use warnigns for all msvc configurations
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f579cd9a20d..c124096c575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,8 +270,8 @@ if(NOT WITH_SDL AND WITH_GHOST_SDL) message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON") endif() -if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE) - message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG") +if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG))) + message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG") endif() # python module, needs some different options @@ -711,8 +711,8 @@ elseif(WIN32) add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB) - set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE) - set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE) + set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE) + set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE) if(CMAKE_CL_64) set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE) |