Skip to content

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

Numerous small fixes in CMakeLists.txt

parent 2776b42a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
CMakeLists.txt
View file @ ba7ee71c
This diff is collapsed.
android/android.toolchain.cmake
View file @ ba7ee71c
...@@ -271,9 +271,9 @@ if( BUILD_WITH_ANDROID_NDK ) ...@@ -271,9 +271,9 @@ if( BUILD_WITH_ANDROID_NDK )
set( STL_PATH "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" ) set( STL_PATH "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
set( STL_LIBRARIES_PATH "${STL_PATH}/libs/${ARMEABI_NDK_NAME}" ) set( STL_LIBRARIES_PATH "${STL_PATH}/libs/${ARMEABI_NDK_NAME}" )
include_directories( "${STL_PATH}/include" "${STL_LIBRARIES_PATH}/include" ) include_directories( "${STL_PATH}/include" "${STL_LIBRARIES_PATH}/include" )
if ( NOT ARMEABI AND NOT FORCE_ARM ) # if ( NOT ARMEABI AND NOT FORCE_ARM )
set( STL_LIBRARIES_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) # set( STL_LIBRARIES_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
endif() # endif()
endif() endif()
if( BUILD_WITH_ANDROID_NDK_TOOLCHAIN ) if( BUILD_WITH_ANDROID_NDK_TOOLCHAIN )
......
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