diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-05-20 13:11:37 +0100 |
|---|---|---|
| committer | Rob Hughes <robert.hughes@arm.com> | 2020-06-02 14:55:00 +0000 |
| commit | bc873d2dac4666a86e4844985199dfd90e67be5b (patch) | |
| tree | 478688dc9a28b497a13ce7b65ef786d1d8b4547b /cmake | |
| parent | bb46dde88befe14583eaac83f65775a7543d4586 (diff) | |
| download | armnn-bc873d2dac4666a86e4844985199dfd90e67be5b.tar.gz | |
Tidy up uses of Windows.h by adding WindowsWrapper.hpp
This header brings in the Win32 API header, with some small modifications
applied to prevent clashes with our code. This means those modifications
don't need to be made in each place that we bring in Windows.h
Change-Id: Ie817c7a167eccbe1ac6a49d3fc940eef8b2f534d
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/GlobalConfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 4e20cc7da5..6aa6321e4b 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -68,7 +68,7 @@ if(COMPILER_IS_GNU_LIKE) elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) # Disable C4996 (use of deprecated identifier) due to https://developercommunity.visualstudio.com/content/problem/252574/deprecated-compilation-warning-for-virtual-overrid.html set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /wd4996") - add_definitions(-DNOMINMAX=1 -DNO_STRICT=1) + add_definitions(-DNO_STRICT=1) endif() if("${CMAKE_SYSTEM_NAME}" STREQUAL Android) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -llog") |