Changeset 69b16f

Timestamp:

01/13/12 15:29:55 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

c90a4c1f1228464d23cf043d910d9c128d5e717f

Parents:

cc0b37e179d94a87d627d031dd4d857bfeeee297

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-13 15:29:55+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-13 15:29:55+01:00

Message:

Plugin extra files should be a custom command and not built after linking. This fixes the issue that the plugin needed to be relinked for new files to be copied to destination

File:

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

telldus-gui/Plugins/TelldusCenterPlugin.cmake

@@ -64 +64 @@
 ENDIF (UPDATE_TRANSLATIONS)
 
+IF(Plugin_PATH)
+        FOREACH(_FILE ${Plugin_FILES})
+                GET_FILENAME_COMPONENT(_FILENAME ${_FILE} NAME)
+                ADD_CUSTOM_COMMAND( OUTPUT ${Plugin_PATH}/${_FILENAME}
+                        COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${Plugin_PATH}/${_FILENAME}
+                        DEPENDS ${_FILE}
+                        COMMENT "Copy ${_FILENAME} for plugin ${Plugin_NAME}"
+                )
+                LIST(APPEND Plugin_TARGET_FILES "${Plugin_PATH}/${_FILENAME}")
+                IF (NOT APPLE)
+                        INSTALL(FILES ${_FILE} DESTINATION "${PLUGIN_LIB_FULL_PATH}/script/${Plugin_PATH_relative}")
+                ENDIF ()
+        ENDFOREACH(_FILE)
+ENDIF(Plugin_PATH)
+
 IF(Plugin_SRCS)
         ADD_LIBRARY(${Plugin_NAME} SHARED
@@ -75 +90 @@
                 ${Plugin_TS}
                 ${Plugin_QM}
+                ${Plugin_TARGET_FILES}
         )
         TARGET_LINK_LIBRARIES( ${Plugin_NAME}   ${Plugin_LIBRARIES} )
@@ -88 +104 @@
                         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 \"\")
@@ -94 +110 @@
                         FOREACH(pr \${prereqs})
                                 GET_ITEM_KEY(\"\${pr}\" rkey)
-                                
+
                                 #Don't change the path to TelldusCore
                                 IF (NOT \"\${rkey}\" STREQUAL \"TelldusCore\")
@@ -118 +134 @@
                 )
                 INSTALL(TARGETS ${Plugin_NAME}
-                        LIBRARY DESTINATION "${PLUGIN_LIB_FULL_PATH}/script" 
+                        LIBRARY DESTINATION "${PLUGIN_LIB_FULL_PATH}/script"
                 )
         ENDIF (APPLE)
@@ -124 +140 @@
 ELSE(Plugin_SRCS)
         ADD_CUSTOM_TARGET(${Plugin_NAME} ALL
-                SOURCES ${Plugin_FILES}
+                SOURCES ${Plugin_FILES} ${Plugin_TARGET_FILES}
         )
 ENDIF(Plugin_SRCS)
-
-IF(Plugin_PATH)
-        ADD_CUSTOM_COMMAND( TARGET ${Plugin_NAME}
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E make_directory ${Plugin_PATH}
-                COMMENT "Creating plugin directory ${Plugin_NAME}"
-        )
-        FOREACH(_FILE ${Plugin_FILES})
-                GET_FILENAME_COMPONENT(_FILENAME ${_FILE} NAME)
-                ADD_CUSTOM_COMMAND( TARGET ${Plugin_NAME}
-                        POST_BUILD
-                        COMMAND ${CMAKE_COMMAND} -E copy ${_FILE} ${Plugin_PATH}
-                        COMMENT "Copy ${_FILENAME} for plugin ${Plugin_NAME}"
-                )
-                IF (NOT APPLE)
-                        INSTALL(FILES ${_FILE} DESTINATION "${PLUGIN_LIB_FULL_PATH}/script/${Plugin_PATH_relative}")
-                ENDIF ()
-        ENDFOREACH(_FILE)
-ENDIF(Plugin_PATH)
-
-