diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 21:37:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 21:37:10 +0300 |
| commit | 05dc109553f447a8ba0d1db7daf2f2c39fcb6d38 (patch) | |
| tree | 00527697bed436d0be5de5c26bd233191a8914b9 /CMakeLists.txt | |
| parent | 195879a50d6b058d78ff6228d8eda159c7abead3 (diff) | |
| parent | 86e20a2e63ea7c4810782942d5a3505f21718068 (diff) | |
Merge branch 'master' into blender2.8
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 4da0f70884a..06d31e0e143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -826,11 +826,11 @@ if (NOT CMAKE_BUILD_TYPE MATCHES "Release") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}") if(MSVC) - set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") + set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") endif() set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}") set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") - set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") + set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") endif() endif() |