From bffc0e8a85e0b9d86e0b0e4e0e803bc121b30ef6 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 22 Apr 2019 23:28:43 -0700
Subject: [PATCH] Re-ordered commands.

---
 CMakeLists.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6e92ef0a5..c8792d87ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,9 +86,9 @@ if (ANDROID)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
   add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
   if (
-      (${HIFI_ANDROID_APP} STREQUAL "questInterface") OR 
+      (${HIFI_ANDROID_APP} STREQUAL "questInterface") OR
       (${HIFI_ANDROID_APP} STREQUAL "questFramePlayer") OR
-      (${HIFI_ANDROID_APP} STREQUAL "framePlayer") 
+      (${HIFI_ANDROID_APP} STREQUAL "framePlayer")
     )
     # We know the quest hardware has this extension, so we can force the use of instanced stereo
     add_definitions(-DHAVE_EXT_clip_cull_distance)
@@ -98,18 +98,18 @@ if (ANDROID)
     # We can also use our own foveated textures
     add_definitions(-DHAVE_QCOM_texture_foveated)
 
-    # if set, the application itself or some library it depends on MUST implement 
+    # if set, the application itself or some library it depends on MUST implement
     # `DisplayPluginList getDisplayPlugins()` and `InputPluginList getInputPlugins()`
-    add_definitions(-DCUSTOM_INPUT_PLUGINS) 
-    add_definitions(-DCUSTOM_DISPLAY_PLUGINS) 
+    add_definitions(-DCUSTOM_INPUT_PLUGINS)
+    add_definitions(-DCUSTOM_DISPLAY_PLUGINS)
     set(PLATFORM_PLUGIN_LIBRARIES oculusMobile oculusMobilePlugin)
   endif()
 
   # Allow client code to use preprocessor macros to distinguish between quest and non-quest builds
   if (${HIFI_ANDROID_APP} STREQUAL "questInterface")
-    add_definitions(-DANDROID_APP_QUEST_INTERFACE) 
+    add_definitions(-DANDROID_APP_QUEST_INTERFACE)
   elseif(${HIFI_ANDROID_APP} STREQUAL "interface")
-    add_definitions(-DANDROID_APP_INTERFACE) 
+    add_definitions(-DANDROID_APP_INTERFACE)
   endif()
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine Xml)
@@ -187,6 +187,8 @@ GroupSources("scripts")
 GroupSources("unpublishedScripts")
 unset(JS_SRC)
 
+set_packaging_parameters()
+
 # Locate the required Qt build on the filesystem
 setup_qt()
 list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
@@ -214,8 +216,6 @@ setup_externals_binary_dir()
 
 option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
 
-set_packaging_parameters()
-
 # FIXME hack to work on the proper Android toolchain
 if (ANDROID)
   add_subdirectory(android/apps/${HIFI_ANDROID_APP})
@@ -249,11 +249,11 @@ add_subdirectory(tools)
 
 if (BUILD_TESTS)
   # Turn on testing so that add_test works
-  # MUST be in the root cmake file for ctest to work 
+  # MUST be in the root cmake file for ctest to work
   include(CTest)
   enable_testing()
   add_subdirectory(tests)
-  if (BUILD_MANUAL_TESTS) 
+  if (BUILD_MANUAL_TESTS)
     add_subdirectory(tests-manual)
   endif()
 endif()