diff options
| author | José Fonseca <jose.r.fonseca@gmail.com> | 2012-10-25 13:35:58 +0100 |
|---|---|---|
| committer | José Fonseca <jose.r.fonseca@gmail.com> | 2012-10-25 13:36:47 +0100 |
| commit | 637cb84b01a4e8ea35b95e39862c3e17dd27fc01 (patch) | |
| tree | 2f8254fc4aa856f2125259e2e47f85a2f5c15a1b /cmake | |
| parent | df64f2d8b6b245568fa7cb1070fd469215469f13 (diff) | |
Don't let android cmake toolchain screw up the binary output path.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/toolchain/android.toolchain.cmake | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/cmake/toolchain/android.toolchain.cmake b/cmake/toolchain/android.toolchain.cmake index 37c9ad15..56c7fd2f 100644 --- a/cmake/toolchain/android.toolchain.cmake +++ b/cmake/toolchain/android.toolchain.cmake @@ -714,18 +714,19 @@ endif() set( ANDROID_SYSTEM_INCLUDE_DIRS "" ) set( ANDROID_SYSTEM_LIB_DIRS "" ) -# setup output directories -set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" ) -set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) - -if(NOT _CMAKE_IN_TRY_COMPILE) - if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) - else() - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) - endif() - set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" ) -endif() +# XXX: commented for apitrace +## setup output directories +#set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "root for library output, set this to change where android libs are installed to" ) +#set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) +# +#if(NOT _CMAKE_IN_TRY_COMPILE) +# if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) +# set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) +# else() +# set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) +# endif() +# set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" ) +#endif() # includes list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${ANDROID_SYSROOT}/usr/include" ) |