From 2db02fdde16e2147937aca21fa44add50bd2dfe3 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Mon, 1 Aug 2016 17:41:47 -0700
Subject: [PATCH] remove QtWebProcess hack on OSX

---
 cmake/macros/FixupInterface.cmake | 58 -------------------------------
 interface/CMakeLists.txt          |  3 --
 2 files changed, 61 deletions(-)
 delete mode 100644 cmake/macros/FixupInterface.cmake

diff --git a/cmake/macros/FixupInterface.cmake b/cmake/macros/FixupInterface.cmake
deleted file mode 100644
index 3e5ea7a3e2..0000000000
--- a/cmake/macros/FixupInterface.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  FixupInterface.cmake
-#  cmake/macros
-#
-#  Copyright 2016 High Fidelity, Inc.
-#  Created by Stephen Birarda on January 6th, 2016
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-#
-
-macro(fixup_interface)
-  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")
-
-    # install QtWebProcess from Qt to the application bundle
-    # since it is missed by macdeployqt
-    # https://bugreports.qt.io/browse/QTBUG-35211
-    set(LIBEXEC_PATH "${_INTERFACE_INSTALL_PATH}/Contents/libexec")
-    install(
-      PROGRAMS "${QT_DIR}/libexec/QtWebProcess"
-      DESTINATION ${LIBEXEC_PATH}
-      COMPONENT ${CLIENT_COMPONENT}
-    )
-
-    set(QTWEBPROCESS_PATH "\${CMAKE_INSTALL_PREFIX}/${LIBEXEC_PATH}")
-
-    # we also need a qt.conf in the directory of QtWebProcess
-    install(CODE "
-      file(WRITE ${QTWEBPROCESS_PATH}/qt.conf
-        \"[Paths]\nPlugins = ../PlugIns\nImports = ../Resources/qml\nQml2Imports = ../Resources/qml\"
-      )"
-      COMPONENT ${CLIENT_COMPONENT}
-    )
-
-    find_program(MACDEPLOYQT_COMMAND macdeployqt PATHS "${QT_DIR}/bin" NO_DEFAULT_PATH)
-
-    if (NOT MACDEPLOYQT_COMMAND AND (PRODUCTION_BUILD OR PR_BUILD))
-      message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\
-        It is required to produce an relocatable interface application.\
-        Check that the environment variable QT_DIR points to your Qt installation.\
-      ")
-    endif ()
-
-    install(CODE "
-      execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\
-        \${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/\
-        -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/\
-        -executable=\${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/Contents/libexec/QtWebProcess\
-      )"
-      COMPONENT ${CLIENT_COMPONENT}
-    )
-
-  endif ()
-endmacro()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index b6e9153f65..9ee7c73f71 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -280,9 +280,6 @@ if (APPLE)
     $<TARGET_FILE_DIR:${TARGET_NAME}>/../Resources/scripts
   )
 
-  # call the fixup_interface macro to add required bundling commands for installation
-  fixup_interface()
-
 else (APPLE)
   # copy the resources files beside the executable
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD