Changeset e7a2e9

Timestamp:

01/27/12 11:35:54 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

03f00a0fffd8fbe8b762541f599dbaa323988e32

Parents:

4ccb9b3563133f2356f6f0bfbb328aa9d6a9db91

git-author:

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

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-27 11:35:54+01:00

Message:

Copy the framworks the plugins depends on, not only rewrite the path

File:

• telldus-gui/Plugins/TelldusCenterPlugin.cmake (modified) (2 diffs)

telldus-gui/Plugins/TelldusCenterPlugin.cmake

@@ -103 +103 @@
                         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/script/${Plugin_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")
 
@@ -116 +117 @@
                                         IF (NOT \${pkey} STREQUAL \${rkey})
                                                 SET(kv \"\")
-                                                SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exe}\" \"\${bundle}/Contents/Frameworks/\" 0)
+                                                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}\"