Numerous small fixes in CMakeLists.txt

ba7ee71c · Andrey Kamaev · 2776b42a · ba7ee71c · ba7ee71c
Commit ba7ee71c authored Jun 28, 2011 by Andrey Kamaev
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +0 -0

android.toolchain.cmake android/android.toolchain.cmake +3 -3

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/android/android.toolchain.cmake
+++ b/android/android.toolchain.cmake
@@ -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 )