3 files changed, 23 insertions, 6 deletions
diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt
index 776d96158..12cf495f6 100644
--- a/src/trace/CMakeLists.txt
+++ b/src/trace/CMakeLists.txt
@@ -1,3 +1,4 @@
+if (${HAVE_POTRACE})
 
 set(trace_SRC
 	filterset.cpp
@@ -25,3 +26,5 @@ set(trace_SRC
 
 # add_inkscape_lib(trace_LIB "${trace_SRC}")
 add_inkscape_source("${trace_SRC}")
+
+endif()
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 58af7d935..46b0af6bb 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -34,7 +34,6 @@ set(ui_SRC
 	tools/dropper-tool.cpp
 	tools/dynamic-base.cpp
 	tools/eraser-tool.cpp
-	tools/flood-tool.cpp
 	tools/freehand-base.cpp
 	tools/gradient-tool.cpp
 	tools/lpe-tool.cpp
@@ -107,7 +106,6 @@ set(ui_SRC
 	dialog/template-widget.cpp
 	dialog/text-edit.cpp
 	dialog/tile.cpp
-	dialog/tracedialog.cpp
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
 	dialog/xml-tree.cpp
@@ -248,7 +246,6 @@ set(ui_SRC
 	dialog/template-widget.h
 	dialog/text-edit.h
 	dialog/tile.h
-	dialog/tracedialog.h
 	dialog/transformation.h
 	dialog/undo-history.h
 	dialog/xml-tree.h
@@ -276,7 +273,6 @@ set(ui_SRC
 	tools/dropper-tool.h
 	tools/dynamic-base.h
 	tools/eraser-tool.h
-	tools/flood-tool.h
 	tools/freehand-base.h
 	tools/gradient-tool.h
 	tools/lpe-tool.h
@@ -364,3 +360,14 @@ endif()
 
 # add_inkscape_lib(ui_LIB "${ui_SRC}")
 add_inkscape_source("${ui_SRC}")
+
+set ( ui_flood_and_trace_SRC
+	tools/flood-tool.h
+	tools/flood-tool.cpp
+	dialog/tracedialog.cpp
+	dialog/tracedialog.h
+)
+
+if ("${HAVE_POTRACE}")
+	add_inkscape_source("${ui_flood_and_trace_SRC}")
+endif()
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index a3e9e14d0..c38bde5cf 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -11,7 +11,6 @@ set(widgets_SRC
 	  measure-toolbar.cpp
 	  mesh-toolbar.cpp
 	  node-toolbar.cpp
-	  paintbucket-toolbar.cpp
 	  pencil-toolbar.cpp
 	  rect-toolbar.cpp
 	  spiral-toolbar.cpp
@@ -67,7 +66,6 @@ set(widgets_SRC
 	  measure-toolbar.h
 	  mesh-toolbar.h
 	  node-toolbar.h
-	  paintbucket-toolbar.h
 	  pencil-toolbar.h
 	  rect-toolbar.h
 	  spiral-toolbar.h
@@ -114,3 +112,12 @@ set(widgets_SRC
 
 # add_inkscape_lib(widgets_LIB "${widgets_SRC}")
 add_inkscape_source("${widgets_SRC}")
+
+set ( widgets_paintbucket_SRC
+	  paintbucket-toolbar.cpp
+	  paintbucket-toolbar.h
+)
+
+if ("${HAVE_POTRACE}")
+	add_inkscape_source("${widgets_paintbucket_SRC}")
+endif()