From 161b49a819af898926b0a93504e8fe5cf5c84bf2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 27 Jan 2015 18:03:27 -0800
Subject: [PATCH] don't install the HockeyApp build

---
 cmake/android/QtCreateAPK.cmake | 2 +-
 gvr-interface/CMakeLists.txt    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/android/QtCreateAPK.cmake b/cmake/android/QtCreateAPK.cmake
index 59f11d3f29..0591acb0ae 100644
--- a/cmake/android/QtCreateAPK.cmake
+++ b/cmake/android/QtCreateAPK.cmake
@@ -121,7 +121,7 @@ macro(qt_create_apk)
   
   # use androiddeployqt to create the apk
   add_custom_target(${TARGET_NAME}-apk
-    COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} --install --verbose --deployment bundled "\\$(ARGS)"
+    COMMAND ${ANDROID_DEPLOY_QT} --input "${TARGET_NAME}-deployment.json" --output "${ANDROID_APK_OUTPUT_DIR}" --android-platform android-${ANDROID_API_LEVEL} ${ANDROID_DEPLOY_QT_INSTALL} --verbose --deployment bundled "\\$(ARGS)"
     DEPENDS ${TARGET_NAME} ${TARGET_NAME}-copy-res ${TARGET_NAME}-copy-assets ${TARGET_NAME}-copy-java ${TARGET_NAME}-copy-libs
   ) 
 endmacro()
\ No newline at end of file
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index 1f39bee631..f8108580a8 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -20,6 +20,7 @@ set(ANDROID_APP_DISPLAY_NAME Interface)
 set(ANDROID_API_LEVEL 19)
 set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
 set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceActivity)
+set(ANDROID_DEPLOY_QT_INSTALL "--install")
 
 find_package(LibOVR REQUIRED)
 target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})
@@ -36,6 +37,7 @@ if (HOCKEY_APP_ID)
   set(HOCKEY_APP_ENABLED true)
   set(HOCKEY_APP_ACTIVITY "<activity android:name='net.hockeyapp.android.UpdateActivity' />")
   set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceBetaActivity)
+  set(ANDROID_DEPLOY_QT_INSTALL "")
   
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/InterfaceBetaActivity.java.in" "${ANDROID_APK_BUILD_DIR}/src/io/highfidelity/gvrinterface/InterfaceBetaActivity.java")
 else ()