Changeset 91cf55

Timestamp:

01/31/12 11:34:39 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

6cbdac52b94aa004d967cf648710a356ebeaebbf

Parents:

4ef7de7ac5c77210567ce43bbb71f8adda0f455b

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-31 11:34:39+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-31 11:34:39+01:00

Message:

Rewrite dependencies for QtComponents desktop on install

File:

• telldus-gui/3rdparty/qt-components-desktop.cmake (modified) (1 diff)

telldus-gui/3rdparty/qt-components-desktop.cmake

@@ -53 +53 @@
                 PREFIX "Plugins/declarative/QtDesktop/plugin/"
         )
+ELSEIF(APPLE)
+        ADD_CUSTOM_COMMAND(TARGET styleplugin POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E make_directory ${QT_COMPONENTS_OUTPUT_DIR}/plugin/
+                COMMAND ${CMAKE_COMMAND} -E copy
+                        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libstyleplugin.dylib
+                        ${QT_COMPONENTS_OUTPUT_DIR}/plugin/
+                COMMENT "Copy plugin to destination bundle"
+        )
+        INSTALL(CODE "
+                GET_FILENAME_COMPONENT(DESTDIR \"\$ENV{DESTDIR}\" ABSOLUTE)
+                SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\")
+                GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid)
+                GET_FILENAME_COMPONENT(exedir \"\${exe}\" PATH)
+                SET(plugin \"\${bundle}/Contents/Plugins/declarative/QtDesktop/plugin/libstyleplugin${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+
+                GET_ITEM_KEY(\"\${plugin}\" pkey)
+                SET(prereqs \"\")
+                GET_PREREQUISITES(\${plugin} prereqs 1 0 \"\${exe}\" \"\${bundle}/Contents/Frameworks/\")
+                FOREACH(pr \${prereqs})
+                        GET_ITEM_KEY(\"\${pr}\" rkey)
+
+                        #Check to see if this is ourself
+                        IF (NOT \${pkey} STREQUAL \${rkey})
+                                SET(kv \"\")
+                                SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exedir}\" \"\${bundle}/Contents/Frameworks/\" 1)
+                                IF (NOT EXISTS \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\")
+                                        COPY_RESOLVED_FRAMEWORK_INTO_BUNDLE(\"\${\${kv}_RESOLVED_ITEM}\" \"\${\${kv}_RESOLVED_EMBEDDED_ITEM}\")
+                                ENDIF ()
+                                EXECUTE_PROCESS(COMMAND install_name_tool
+                                        -change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${plugin}\"
+                                )
+                        ENDIF ()
+
+                ENDFOREACH()
+        ")
 ELSE()
         SET_TARGET_PROPERTIES(styleplugin PROPERTIES