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

List:       kde-commits
Subject:    playground/graphics/krita2-plugins/experimental
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2009-03-03 19:26:45
Message-ID: 1236108405.033391.20372.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 934781 by berger:

make shiva generator work with installed headers

 M  +2 -8      CMakeLists.txt  
 M  +2 -1      ctlbrush/CMakeLists.txt  
 M  +0 -2      ctlbrush/ctlbrush.cc  
 M  +2 -6      shivagenerator/shivagenerator.cpp  
 M  +1 -1      shivagenerator/shivagenerator.h  


--- trunk/playground/graphics/krita2-plugins/experimental/CMakeLists.txt \
#934780:934781 @@ -5,17 +5,11 @@
   add_subdirectory(panorama)
 endif(GMM_FOUND AND NOT MSVC)
 
-
-#find_package(Spnav)
-#if(HAVE_SPNAV)
-#  add_subdirectory(spacenav)
-#endif(HAVE_SPNAV)
-
 find_package(OpenCTL)
 
-if(HAVE_OPENCTL)
+# if(HAVE_OPENCTL)
 #  add_subdirectory(ctlbrush)
-endif(HAVE_OPENCTL)
+# endif(HAVE_OPENCTL)
 
 find_package(OpenShiva)
 
--- trunk/playground/graphics/krita2-plugins/experimental/ctlbrush/CMakeLists.txt \
#934780:934781 @@ -1,3 +1,4 @@
+include_directories(${OPENCTL_INCLUDE_DIR})
 
 set(krita_ctlbrush_PART_SRCS ctlbrush.cc ctlbrush_dock.cc kis_ctl_brush.cc )
 
@@ -6,7 +7,7 @@
 kde4_add_plugin(kritactlbrush ${krita_ctlbrush_PART_SRCS})
 
 target_link_libraries(kritactlbrush  ${KRITA_UI_LIBS} ${OPENCTL_LIBRARIES} \
                ${KRITA_PAINTOP_LIBS})
-set_target_properties( kritactlbrush PROPERTIES COMPILE_FLAGS \
${OPENCTL_COMPILE_FLAGS}) +add_definitions(${OPENCTL_COMPILE_FLAGS})
 
 
 install(TARGETS kritactlbrush  DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/playground/graphics/krita2-plugins/experimental/ctlbrush/ctlbrush.cc \
#934780:934781 @@ -30,9 +30,7 @@
 
 #include <KoDockFactory.h>
 
-#include "kis_config.h"
 #include "kis_cursor.h"
-#include "kis_global.h"
 #include "kis_types.h"
 #include "kis_view2.h"
 
--- trunk/playground/graphics/krita2-plugins/experimental/shivagenerator/shivagenerator.cpp \
#934780:934781 @@ -14,16 +14,12 @@
 #include <KoProgressUpdater.h>
 #include <KoColorSpaceRegistry.h>
 
-#include <kis_fill_painter.h>
 #include <kis_image.h>
 #include <kis_paint_device.h>
 #include <kis_iterators_pixel.h>
-#include <kis_layer.h>
-#include <generator/kis_generator_registry.h>
-#include <kis_global.h>
-#include <kis_selection.h>
+#include <kis_generator_registry.h>
 #include <kis_types.h>
-#include <filter/kis_filter_configuration.h>
+#include <kis_filter_configuration.h>
 #include <kis_processing_information.h>
 
 #include <OpenShiva/Kernel.h>
--- trunk/playground/graphics/krita2-plugins/experimental/shivagenerator/shivagenerator.h \
#934780:934781 @@ -2,7 +2,7 @@
 #define _SHIVAGENERATOR_H_
 
 #include <kparts/plugin.h>
-#include "generator/kis_generator.h"
+#include "kis_generator.h"
 
 class KisConfigWidget;
 


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