From 1a10d2eb72e176ecfc1068bd7f99a94777e67b75 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 7 Jan 2016 14:10:33 -0800
Subject: [PATCH] switch to a DragNDrop installer for OS X

---
 cmake/macros/GenerateInstallers.cmake     | 15 +++++++--------
 cmake/macros/SetPackagingParameters.cmake |  8 ++++----
 console/CMakeLists.txt                    |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index cbe95f15f9..cea767fec9 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -18,6 +18,7 @@ macro(GENERATE_INSTALLERS)
   if (APPLE)
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "/")
     set(CPACK_PACKAGING_INSTALL_PREFIX /)
+    set(CPACK_OSX_PACKAGE_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
   endif ()
 
   # setup downloads
@@ -29,25 +30,23 @@ macro(GENERATE_INSTALLERS)
   set(CLIENT_GROUP client)
 
   # add a component group for the client
-  cpack_add_component_group(
-    ${CLIENT_GROUP}
-    DISPLAY_NAME "Client"
-    EXPANDED
-  )
+  # cpack_add_component_group(
+  #   ${CLIENT_GROUP}
+  #   DISPLAY_NAME "Client"
+  #   EXPANDED
+  # )
 
   cpack_add_component(
     ${CLIENT_COMPONENT}
     DISPLAY_NAME "High Fidelity Client"
-    GROUP ${CLIENT_GROUP}
   )
 
-  if (DDE_APP_PATH)
+  if (WIN32 AND DDE_APP_PATH)
     # add a download component for DDE
     cpack_add_component(
       ${DDE_COMPONENT}
       DISPLAY_NAME "Webcam Body Movement"
       DEPENDS ${CLIENT_COMPONENT}
-      GROUP ${CLIENT_GROUP}
       DOWNLOADED
       ARCHIVE_FILE "DDE"
     )
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index a5c65b1dc5..142f7fcc8c 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -44,12 +44,12 @@ macro(SET_PACKAGING_PARAMETERS)
   endif ()
 
   if (APPLE)
-    set(CONSOLE_INSTALL_DIR "Applications/High Fidelity")
+    set(CONSOLE_INSTALL_DIR ".")
     set(CONSOLE_APPLICATION_NAME "Server Console.app")
-    set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_APPLICATION_NAME}")
+    set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_APPLICATION_NAME}")
 
-    set(INTERFACE_INSTALL_DIR "Applications/High Fidelity")
-    set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app")
+    set(INTERFACE_INSTALL_DIR ".")
+    set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_BUNDLE_NAME}.app")
   else ()
     set(CONSOLE_INSTALL_DIR ".")
     set(INTERFACE_INSTALL_DIR ".")
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 6f813489a1..be02fe5fcf 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -25,7 +25,7 @@ endif ()
 # install the packaged Server Console
 install(
   PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app"
-  DESTINATION "Applications/High Fidelity"
+  DESTINATION ${CONSOLE_INSTALL_DIR}
   COMPONENT ${SERVER_COMPONENT}
 )