Debugging when to use macdeployqt.

cmake/macros/FixupNitpick.cmake

@@ -24,13 +24,8 @@ macro(fixup_nitpick)
             ")
         endif ()
 
-    install(CODE "
+        add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-      execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\
+        (COMMAND ${MACDEPLOYQT_COMMAND}\${CMAKE_INSTALL_PREFIX}/${_INTERFACE_INSTALL_PATH}/ -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/
-        \${CMAKE_INSTALL_PREFIX}/${_NITPICK_INSTALL_PATH}/\
-        -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/\
-      )"
-      COMPONENT ${CLIENT_COMPONENT}
         )
-
     endif ()
 endmacro()

cmake/macros/PackageLibrariesForDeployment.cmake

@@ -63,24 +63,6 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
       # remove directory
       COMMAND  ${CMAKE_COMMAND} -E remove_directory "${QTAUDIO_PATH}"
     )
-    elseif (APPLE)
-        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. macdeployqt is required.")
-        endif ()
-
-        # add a post-build command to call macdeployqt to copy Qt plugins
-        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/
-        )
-
-        add_custom_command(
-            TARGET ${TARGET_NAME}
-            POST_BUILD
-            COMMAND CMD /C "SET PATH=${QT_DIR}/bin;%PATH% && ${WINDEPLOYQT_COMMAND}\
-                ${EXTRA_DEPLOY_OPTIONS} $<$<OR:$<CONFIG:Release>,$<CONFIG:MinSizeRel>,$<CONFIG:RelWithDebInfo>>:--release>\
-                --no-compiler-runtime --no-opengl-sw --no-angle -no-system-d3d-compiler \"$<TARGET_FILE:${TARGET_NAME}>\""
-        )
   endif ()
 endmacro()