diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/buildtools/FindTexturePacker.cmake | 10 | ||||
| -rw-r--r-- | cmake/scripts/android/Install.cmake | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake index a4acf6453a..4817d15799 100644 --- a/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake @@ -50,9 +50,13 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) # and unset TEXTUREPACKER_EXECUTABLE variable message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!") endif() - else() - # Ship TexturePacker only on Linux and FreeBSD - if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") + endif() + + # Ship TexturePacker only on Linux and FreeBSD + if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") + # But skip shipping it if build architecture can be executed on host + # and TEXTUREPACKER_EXECUTABLE is found + if(NOT (HOST_CAN_EXECUTE_TARGET AND TEXTUREPACKER_EXECUTABLE)) set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE) endif() endif() diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index 2b2ecb9247..bbe5ea0bb8 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -109,6 +109,7 @@ function(add_bundle_file file destination relative) file(REMOVE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake) add_custom_target(bundle_files COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/BundleFiles.cmake) add_dependencies(bundle bundle_files) + add_dependencies(bundle_files ${APP_NAME_LC}) endif() string(REPLACE "${relative}/" "" outfile ${file}) @@ -151,7 +152,7 @@ if(CPU MATCHES i686) endif() foreach(target apk obb apk-obb apk-clean) add_custom_target(${target} - COMMAND env PATH=${NATIVEPREFIX}/bin:$ENV{PATH} ${CMAKE_MAKE_PROGRAM} + COMMAND env PATH=${NATIVEPREFIX}/bin:$ENV{PATH} ${CMAKE_MAKE_PROGRAM} -j1 -C ${CMAKE_BINARY_DIR}/tools/android/packaging CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} CC=${CMAKE_C_COMPILER} |