third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Numerous small fixes in CMakeLists.txt

Browse Source
This commit is contained in:
Andrey Kamaev
2011-06-28 05:18:53 +00:00
parent 2776b42a7b
commit ba7ee71c20
2 changed files with 85 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/android.toolchain.cmake
+3 -3
View File
@@ -271,9 +271,9 @@ if( BUILD_WITH_ANDROID_NDK )
set( STL_PATH "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" )
set( STL_LIBRARIES_PATH "${STL_PATH}/libs/${ARMEABI_NDK_NAME}" )
include_directories( "${STL_PATH}/include" "${STL_LIBRARIES_PATH}/include" )
if ( NOT ARMEABI AND NOT FORCE_ARM )
set( STL_LIBRARIES_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
endif()
# if ( NOT ARMEABI AND NOT FORCE_ARM )
# set( STL_LIBRARIES_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/arm-linux-androideabi/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" )
# endif()
endif()
if( BUILD_WITH_ANDROID_NDK_TOOLCHAIN )