Skip to content

O
opencv
Commit e9392d14 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fix Android build with cmake 2.6.3

parent 90a3d227
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
3rdparty/libpng/CMakeLists.txt
View file @ e9392d14
...@@ -30,6 +30,7 @@ if(MSVC) ...@@ -30,6 +30,7 @@ if(MSVC)
endif(MSVC) endif(MSVC)
add_library(${PNG_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs}) add_library(${PNG_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
target_link_libraries(${PNG_LIBRARY} ${ZLIB_LIBRARY})
if(UNIX) if(UNIX)
if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC) if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
......
android/android.toolchain.cmake
View file @ e9392d14
...@@ -796,6 +796,7 @@ set( CMAKE_ASM_COMPILER_ID GNU ) ...@@ -796,6 +796,7 @@ set( CMAKE_ASM_COMPILER_ID GNU )
set( CMAKE_ASM_COMPILER_WORKS TRUE ) set( CMAKE_ASM_COMPILER_WORKS TRUE )
set( CMAKE_ASM_COMPILER_FORCED TRUE ) set( CMAKE_ASM_COMPILER_FORCED TRUE )
set( CMAKE_COMPILER_IS_GNUASM 1) set( CMAKE_COMPILER_IS_GNUASM 1)
set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm )
# NDK flags # NDK flags
if( ARMEABI OR ARMEABI_V7A ) if( ARMEABI OR ARMEABI_V7A )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment