From f2678ddb73bca06a6570b27559e3234cc96df270 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 29 Apr 2019 12:57:08 -0700
Subject: [PATCH] Corrected both installers.

---
 cmake/macros/FixupInterface.cmake | 34 +++++++++++++------------------
 cmake/macros/FixupNitpick.cmake   |  2 +-
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/cmake/macros/FixupInterface.cmake b/cmake/macros/FixupInterface.cmake
index d08ad2ac41..fd3918964a 100644
--- a/cmake/macros/FixupInterface.cmake
+++ b/cmake/macros/FixupInterface.cmake
@@ -10,28 +10,22 @@
 #
 
 macro(fixup_interface)
-  if (APPLE)
+    if (APPLE)
+        string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${INTERFACE_BUNDLE_NAME})
+        string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${INTERFACE_INSTALL_DIR})
+        set(_INTERFACE_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app")
 
-    string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${INTERFACE_BUNDLE_NAME})
-    string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${INTERFACE_INSTALL_DIR})
-    set(_INTERFACE_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app")
+        find_program(MACDEPLOYQT_COMMAND macdeployqt PATHS "${QT_DIR}/bin" NO_DEFAULT_PATH)
 
-    find_program(MACDEPLOYQT_COMMAND macdeployqt PATHS "${QT_DIR}/bin" NO_DEFAULT_PATH)
+        if (NOT MACDEPLOYQT_COMMAND)
+            message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\
+                It is required to produce a relocatable interface application.\
+                Check that the variable QT_DIR points to your Qt installation.\
+            ")
+        endif ()
 
-    if (NOT MACDEPLOYQT_COMMAND)
-      message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\
-        It is required to produce an relocatable interface application.\
-        Check that the variable QT_DIR points to your Qt installation.\
-      ")
+        add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+            COMMAND ${MACDEPLOYQT_COMMAND}\${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/ -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/
+        )
     endif ()
-
-    install(CODE "
-      execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\
-        \${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/\
-        -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/\
-      )"
-      COMPONENT ${CLIENT_COMPONENT}
-    )
-
-  endif ()
 endmacro()
diff --git a/cmake/macros/FixupNitpick.cmake b/cmake/macros/FixupNitpick.cmake
index 3c7d89e833..4ca6c01869 100644
--- a/cmake/macros/FixupNitpick.cmake
+++ b/cmake/macros/FixupNitpick.cmake
@@ -25,7 +25,7 @@ macro(fixup_nitpick)
         endif ()
 
         add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-            COMMAND ${MACDEPLOYQT_COMMAND}\${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/ -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/
+            COMMAND ${MACDEPLOYQT_COMMAND}\${CMAKE_INSTALL_PREFIX}/${_NITPICK_INSTALL_PATH}/ -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/
         )
     endif ()
 endmacro()