Cmake: Fix some undefined function calls

(bzr r5611)

8 files changed, 57 insertions, 14 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91e87d740..4c4a74e00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -512,7 +512,8 @@ ${ONLY_WIN}
 # All folder with CMakeLists.txt files (excluding internal libraries)

 SET(srcfolders

 algorithms

-api

+api
+application

 bind

 debug
 dialogs

@@ -525,8 +526,12 @@ dom/util
 extension

 #extension/dxf2svg

 extension/implementation

-extension/internal

-extension/param

+extension/internal
+extension/internal/bitmap
+extension/internal/filter
+extension/internal/pdfinput

+extension/param
+extension/script

 graphlayout

 helper

 inkjar

@@ -569,8 +574,6 @@ ENDFOREACH(dirlist)
 # All directories containing lists files that describe building internal libraries

 SET(libfolders
 2geom

-application

-#dialogs

 libavoid

 libcola

 libcroco

diff --git a/src/algorithms/CMakeLists.txt b/src/algorithms/CMakeLists.txt
index 36b860adb..c4ef6aafb 100644
--- a/src/algorithms/CMakeLists.txt
+++ b/src/algorithms/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(algorithms
+SET(algorithms_SRC
 find-if-before.h
 find-last-if.h
 longest-common-suffix.h
diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
index e6dfe1105..e2e9ff892 100644
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@@ -1,3 +1,3 @@
-SET(api
-api/inkscape.idl
+SET(api_SRC
+#inkscape.idl
 )
diff --git a/src/application/CMakeLists.txt b/src/application/CMakeLists.txt
index bfd2141ff..b8ec44923 100644
--- a/src/application/CMakeLists.txt
+++ b/src/application/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(application
+SET(application_SRC
 editor.cpp
 editor.h
 application.cpp
@@ -6,4 +6,3 @@ application.h
 app-prototype.cpp
 app-prototype.h
 )
-ADD_LIBRARY(inkapp STATIC ${application})
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index d8737f7a4..0b3351968 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(dialogs
+SET(dialogs_SRC
 clonetiler.cpp
 clonetiler.h
 debugdialog.cpp
@@ -31,6 +31,8 @@ layer-properties.cpp
 layer-properties.h
 layers-panel.cpp
 layers-panel.h
+makefile.in
+Makefile_insert
 object-attributes.cpp
 object-attributes.h
 rdf.cpp
diff --git a/src/extension/internal/filter/CMakeLists.txt b/src/extension/internal/filter/CMakeLists.txt
new file mode 100644
index 000000000..f619dd5c7
--- /dev/null
+++ b/src/extension/internal/filter/CMakeLists.txt
@@ -0,0 +1,31 @@
+SET(extension_internal_filter_SRC
+apparition.h
+bloom.h
+clouds.h
+crystal.h
+cutout.h
+drop-shadow.h
+etched-glass.h
+filter-all.cpp
+filter.cpp
+filter-file.cpp
+filter.h
+fire.h
+frost.h
+ink-bleed.h
+jelly-bean.h
+jigsaw-piece.h
+leopard-fur.h
+metal.h
+motion-blur.h
+oil-slick.h
+patterned-glass.h
+ridged-border.h
+ripple.h
+roughen.h
+rubber-stamp.h
+sepia.h
+snow.h
+speckle.h
+zebra.h
+)
diff --git a/src/extension/script/CMakeLists.txt b/src/extension/script/CMakeLists.txt
index 693948508..a09528bb5 100644
--- a/src/extension/script/CMakeLists.txt
+++ b/src/extension/script/CMakeLists.txt
@@ -1,3 +1,4 @@
 SET(extension_script_SRC
 InkscapeScript.cpp
+InkscapeScript.h
 )
diff --git a/src/ui/dialog/CMakeLists.txt b/src/ui/dialog/CMakeLists.txt
index a8999e853..b36afce45 100644
--- a/src/ui/dialog/CMakeLists.txt
+++ b/src/ui/dialog/CMakeLists.txt
@@ -1,3 +1,11 @@
+IF(WIN32)
+SET(ui_dialog_WIN32_SRC
+filedialogimpl-win32.cpp
+filedialogimpl-win32.h)
+ELSEIF(WIN32)
+    SET(ui_dialog_WIN32_SRC)
+ENDIF(WIN32)
+
 SET(ui_dialog_SRC
 aboutbox.cpp
 aboutbox.h
@@ -22,8 +30,6 @@ filedialog.cpp
 filedialog.h
 filedialogimpl-gtkmm.cpp
 filedialogimpl-gtkmm.h
-filedialogimpl-win32.cpp
-filedialogimpl-win32.h
 fill-and-stroke.cpp
 fill-and-stroke.h
 filter-effects-dialog.cpp
@@ -71,4 +77,5 @@ undo-history.h
 #whiteboard-sharewithuser.h
 xml-editor.cpp
 xml-editor.h
-)
\ No newline at end of file
+${ui_dialog_WIN32_SRC}
+)