[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/assistants/RulerAssistant
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2009-05-05 9:58:33
Message-ID: 1241517513.197227.24285.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 963713 by berger:

merge the ruler assistant in one plugin

 M  +24 -2     CMakeLists.txt  
 A             Ruler.cc   RulerAssistantCommon/Ruler.cc#961276 [License: LGPL (v2)]
 A             Ruler.h   RulerAssistantCommon/Ruler.h#961276 [License: LGPL (v2)]
 A             RulerAssistant.cc   RulerAssistantCommon/RulerAssistant.cc#963707 \
[License: LGPL (v2)]  A             RulerAssistant.h   \
RulerAssistantCommon/RulerAssistant.h#963707 [License: LGPL (v2)]  D             \
RulerAssistantCommon (directory)    D             RulerAssistantTool (directory)  
 A             kis_ruler_assistant_tool.cc   \
RulerAssistantTool/kis_ruler_assistant_tool.cc#963707 [License: LGPL (v2)]  A         \
kis_ruler_assistant_tool.h   RulerAssistantTool/kis_ruler_assistant_tool.h#963707 \
[License: LGPL (v2)]  A             krita_tool_ruler_assistant.png   \
RulerAssistantTool/krita_tool_ruler_assistant.png#961276  A             \
kritarulerassistanttool.desktop   \
RulerAssistantTool/kritarulerassistanttool.desktop#961276  A             \
ruler_assistant_tool.cc   RulerAssistantTool/ruler_assistant_tool.cc#961276 [License: \
LGPL (v2)]  A             ruler_assistant_tool.h   \
RulerAssistantTool/ruler_assistant_tool.h#961276 [License: LGPL (v2)]


--- trunk/koffice/krita/plugins/assistants/RulerAssistant/CMakeLists.txt \
#963712:963713 @@ -1,2 +1,24 @@
-add_subdirectory(RulerAssistantCommon)
-add_subdirectory(RulerAssistantTool)
\ No newline at end of file
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../RulerAssistantCommon)
+
+set(kritarulerassistanttool_PART_SRCS
+    Ruler.cc
+    RulerAssistant.cc
+    ruler_assistant_tool.cc
+    kis_ruler_assistant_tool.cc
+    )
+
+# kde4_add_ui_files(kritarulerassistanttool_PART_SRCS RulerAssistantToolOptions.ui )
+
+kde4_add_plugin(kritarulerassistanttool ${kritarulerassistanttool_PART_SRCS})
+
+
+
+target_link_libraries(kritarulerassistanttool kritaui flake ${QT_QT3SUPPORT_LIBRARY} \
${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} KritaRulerAssistantCommon) +
+install(TARGETS kritarulerassistanttool  DESTINATION ${PLUGIN_INSTALL_DIR})
+
+
+########### install files ###############
+
+install( FILES krita_tool_ruler_assistant.png   DESTINATION \
${DATA_INSTALL_DIR}/krita/pics) +install( FILES  kritarulerassistanttool.desktop  \
DESTINATION ${SERVICES_INSTALL_DIR})


[prev in list] [next in list] [prev in thread] [next in thread]