diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-02-24 02:58:55 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-02-24 02:58:55 -0600 |
| commit | a39eee28e9698ccba0e1cb142f86a670ce522c81 (patch) | |
| tree | 00e8c2aac89ea147a1cbd144a1050a5f77288184 /Source | |
| parent | bd0d5c1a22693289c38661ab00bf3e564b0692d3 (diff) | |
Fix a typo in the Android cmake toolchain script.
This was a fairly recent update that went unnoticed because it uses a cached variable.
When I previously updated Android cmake I didn't noticed this.
Basically the issue was that Android cmake was no longer setting ${LIBRARY_OUTPUT_PATH_ROOT}
and instead only setting it to ${CMAKE_SOURCE_DIR} if it was passed a variable.
Same PR is open on the android cmake repo here https://github.com/taka-no-me/android-cmake/pull/37
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/android.toolchain.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/android.toolchain.cmake b/Source/Android/android.toolchain.cmake index 07100ee33d..9e9add26ff 100644 --- a/Source/Android/android.toolchain.cmake +++ b/Source/Android/android.toolchain.cmake @@ -1487,7 +1487,7 @@ endif() # setup output directories set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) -if( DEFINED LIBRARY_OUTPUT_PATH_ROOT +if( NOT DEFINED LIBRARY_OUTPUT_PATH_ROOT OR EXISTS "${CMAKE_SOURCE_DIR}/AndroidManifest.xml" OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") ) set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR} CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" ) |