From fb87f68b19988470e03c5c3f3443dcd15c7ecd3f Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 14 Jun 2017 13:57:38 +0100 Subject: [PATCH] Build android apk inside build folder, not in source tree * This means multiple builds don't cross-contaminate, and removing the build folder will clean everything up again. --- renderdoccmd/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renderdoccmd/CMakeLists.txt b/renderdoccmd/CMakeLists.txt index 7113f3b57..287c216c7 100644 --- a/renderdoccmd/CMakeLists.txt +++ b/renderdoccmd/CMakeLists.txt @@ -65,7 +65,8 @@ if(ANDROID) add_custom_command(OUTPUT ${APK_FILE} DEPENDS renderdoc DEPENDS renderdoccmd - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/renderdoccmd/android + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/android ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory libs/${ANDROID_ABI} COMMAND ${CMAKE_COMMAND} -E copy $ libs/${ANDROID_ABI}/$ COMMAND ${CMAKE_COMMAND} -E copy $ libs/${ANDROID_ABI}/$