Assorted fixes:

* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
This commit is contained in:
Andrey Kamaev
2014-12-21 17:59:50 +03:00
parent 183454a723
commit c105b72945
11 changed files with 28 additions and 21 deletions

View File

@@ -14,7 +14,7 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
file(GLOB lib_srcs *.c)
file(GLOB lib_hdrs *.h)
if(NEON)
if(NEON AND CMAKE_SIZEOF_VOID_P EQUAL 4)
list(APPEND lib_srcs arm/filter_neon.S)
add_definitions(-DPNG_ARM_NEON)
endif()