BUG: Copy ctkMacroBuildQtPlugin if from branch plugin-framework

CMake/ctkMacroBuildQtPlugin.cmake

@@ -6,7 +6,7 @@
 
 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
@@ -32,10 +32,10 @@ MACRO(ctkMacroBuildQtPlugin)
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${MY_INCLUDE_DIRECTORIES}
-    )  
+    )
   INCLUDE_DIRECTORIES(
     ${my_includes}
-    )  
+    )
  
   SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
   SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
@@ -51,12 +51,12 @@ MACRO(ctkMacroBuildQtPlugin)
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")
-  IF(DEFINED MY_QRC_FILES)
-    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
+  IF(DEFINED MY_RESOURCES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()
 
   SOURCE_GROUP("Resources" FILES
-    ${MY_UI_RESOURCES}
+    ${MY_RESOURCES}
     ${MY_UI_FORMS}
     )
 
@@ -72,20 +72,16 @@ MACRO(ctkMacroBuildQtPlugin)
     ${MY_QRC_SRCS}
     )
 
-  # Set labels associated with the target.
-  SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LABELS ${lib_name})
-  
   # Note: The plugin may be installed in some other location ???
   # Install rules
-#   IF(CTK_BUILD_SHARED_LIBS)
-#     INSTALL(TARGETS ${lib_name}
-#       RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-#       LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
-#       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-#   ENDIF()
+# IF(CTK_BUILD_SHARED_LIBS)
+# INSTALL(TARGETS ${lib_name}
+# RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
+# LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+# ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
+# ENDIF()
   
   SET(my_libs
-    ${CTK_BASE_LIBRARIES}
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
@@ -93,9 +89,10 @@ MACRO(ctkMacroBuildQtPlugin)
   # Install headers
   #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   #INSTALL(FILES
-  #  ${headers}
-  #  ${dynamicHeaders}
-  #  DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
-  #  )
+  # ${headers}
+  # ${dynamicHeaders}
+  # DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
+  # )
 
 ENDMACRO()
+