diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 10:45:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:09 +0300 |
| commit | f1088bd9e16ea033affeade6b14235b787bb31ad (patch) | |
| tree | 0620f052b7324e648d620c2e666da6c6b7b4768f | |
| parent | ac5e989d4ac3c31488a94d629a5025a55a978d93 (diff) | |
CMake: Ignore paranoid MSVC linker warnings
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/datatoc/CMakeLists.txt | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b388ccd5f8..891539e0b34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1288,6 +1288,10 @@ elseif(WIN32) set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib") + # Ignore meaningless for us linker warnings. + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221") + set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221") + # MSVC only, Mingw doesnt need if(CMAKE_CL_64) set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}") diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index 4c35a941757..0f123fbf9f0 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -51,6 +51,9 @@ if(NOT WITH_HEADLESS) ../blenlib/intern/winstuff_dir.c ../../../intern/utfconv/utfconv.c ) + + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}") + set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}") endif() include_directories(${PNG_INCLUDE_DIRS}) |