Merge pull request #732 from alalek:gnu_toolchain

159534a2 · Vadim Pisarevsky · afcb7bb4 · 38ece115 · 159534a2
Commit 159534a2 authored Jul 18, 2016 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CMakeLists.txt modules/dnn/CMakeLists.txt +3 -1

No files found.
--- a/modules/dnn/CMakeLists.txt
+++ b/modules/dnn/CMakeLists.txt
 cmake_minimum_required(VERSION 2.8)

-if(APPLE_FRAMEWORK OR WINRT)
+if(APPLE_FRAMEWORK OR WINRT
+    OR AARCH64 # protobuf doesn't know this platform
+)
  ocv_module_disable(dnn)
 endif()