Changeset 0e0e68

Timestamp:

09/07/11 15:35:03 (22 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '668dd99ac278cfd419d67879b141678facea630a')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

9e1bcc5edd3acdba7f665b2344589e061a49c967

Parents:

bc7466cbc222cda5b76795f2044abc72507a9c68

git-author:

Micke Prag <micke.prag@telldus.se>2011-09-07 13:35:03+00:00

git-committer:

Micke Prag <micke.prag@telldus.se>2011-09-07 13:35:03+00:00

Message:

Fix the plugins with install_tool_name using BundleUtilities

File:

• telldus-gui/Plugins/TelldusCenterPlugin.cmake (modified) (1 diff)

telldus-gui/Plugins/TelldusCenterPlugin.cmake

@@ -82 +82 @@
                         PREFIX "../"
                 )
+                INSTALL(CODE "
+                        GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE)
+                        SET(app \"\${DESTDIR}/Applications/TelldusCenter.app\")
+                        GET_BUNDLE_AND_EXECUTABLE(\"\${app}\" bundle exe valid)
+                        SET(plugin \"\${bundle}/Contents/Plugins/script/${Plugin_NAME}${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)
+                                
+                                #Don't change the path to our own libraries
+                                IF (NOT \"\${rkey}\" MATCHES \"^Telldus\")
+                                        #Check to see if this is ourself
+                                        IF (NOT \${pkey} STREQUAL \${rkey})
+                                                SET(kv \"\")
+                                                SET_BUNDLE_KEY_VALUES(kv \"\${pr}\" \"\${pr}\" \"\${exe}\" \"\${bundle}/Contents/Frameworks/\" 0)
+                                                EXECUTE_PROCESS(COMMAND install_name_tool
+                                                        -change \"\${pr}\" \"\${\${rkey}_EMBEDDED_ITEM}\" \"\${plugin}\"
+                                                )
+                                        ENDIF ()
+                                ENDIF ()
+
+                        ENDFOREACH()
+                ")
         ELSEIF (WIN32)
                 SET_TARGET_PROPERTIES(${Plugin_NAME} PROPERTIES