From 5822386702d04ee5e048417c91c3e6d95d22af11 Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Mon, 30 Nov 2015 08:56:30 -0600
Subject: [PATCH] Checkpoint

---
 CMakeLists.txt                                | 32 +++++++++++--------
 cmake/macros/ConsolidateStackComponents.cmake |  2 ++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc11d28a2e..500c27791b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,19 +222,23 @@ if (HIFI_MEMORY_DEBUGGING)
   endif (UNIX)
 endif ()
 
-set(CPACK_PACKAGE_NAME "High Fidelity")
-set(CPACK_PACKAGE_VENDOR "High Fidelity, Inc")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High Fidelity Interface and Stack")
-set(CPACK_PACKAGE_VERSION "${BUILD_SEQ}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${BUILD_SEQ}")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "High Fidelity")
-set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Interface.lnk' '$INSTDIR\\\\interface.exe'")
-set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\StacK Manager.lnk' '$INSTDIR\\\\stack-manager.exe'")
+include_application_version()
 
-if (WIN32)
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/full-stack-deployment/ DESTINATION "./")
-endif (WIN32)
+if (DEFINED ENV{ghprbPullId})
+  set(CPACK_PACKAGE_NAME "High Fidelity - Test Build")
+  set(CPACK_PACKAGE_VENDOR "High Fidelity, Inc")
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High Fidelity Interface and Stack")
+  set(CPACK_PACKAGE_VERSION "${BUILD_SEQ}")
+  set(CPACK_PACKAGE_VERSION_MAJOR "${BUILD_SEQ}")
+  set(CPACK_PACKAGE_VERSION_MINOR "0")
+  set(CPACK_PACKAGE_VERSION_PATCH "0")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "High Fidelity - Test Build")
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Interface.lnk' '$INSTDIR\\\\interface.exe'")
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\StacK Manager.lnk' '$INSTDIR\\\\stack-manager.exe'")
 
-include(CPack)
\ No newline at end of file
+  if (WIN32)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/full-stack-deployment/ DESTINATION "./")
+  endif (WIN32)
+
+  include(CPack)
+endif ()
\ No newline at end of file
diff --git a/cmake/macros/ConsolidateStackComponents.cmake b/cmake/macros/ConsolidateStackComponents.cmake
index 2b2fe9a691..50a1f5e48a 100644
--- a/cmake/macros/ConsolidateStackComponents.cmake
+++ b/cmake/macros/ConsolidateStackComponents.cmake
@@ -1,9 +1,11 @@
 macro(CONSOLIDATE_STACK_COMPONENTS)
 
+  if (DEFINED ENV{ghprbPullId})
   # Copy all the output for this target into the common deployment location
   add_custom_command(
   	TARGET ${TARGET_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/full-stack-deployment
   )
+  endif ()
 
 endmacro()
\ No newline at end of file