diff options
| author | Stéphane Lenclud <github@lenclud.com> | 2019-03-27 20:54:09 +0100 |
|---|---|---|
| committer | Stéphane Lenclud <github@lenclud.com> | 2019-03-27 20:54:09 +0100 |
| commit | 905bd334505bbdbcab75d813da0ee701387a3666 (patch) | |
| tree | d5248e807a0109c9ae4c4b9453ed1b5cfc3bc368 | |
| parent | 50e1aa528fa433339405d1a2139a0acdc799c0d1 (diff) | |
Not changing _ITERATOR_DEBUG_LEVEL default value any more when using default toolchain.
Thus making default MSVC build working with default OpenCV static library build.
Closes #920.
| -rw-r--r-- | cmake/msvc.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 8bf431b9..f9ef5fd5 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -20,6 +20,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) #C4928 - illegal copy-initialization, more than one user-defined conversion has been implicitly applied set(warns-disable 4530 4577 4789 4244 4702 4530 4244 4127 4458 4456 4251 4100 4702 4457) +add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) add_definitions(-D_ENABLE_ATOMIC_ALIGNMENT_FIX) add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING) diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 24f0f977..be09d6db 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -124,7 +124,6 @@ if(MSVC) add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1) add_definitions(-D_SCL_SECURE_NO_WARNINGS) - add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_HAS_EXCEPTIONS=0) add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) |