process source subdirectories with INCLUDE() instead of ADD_DIRECTORIES()

This more or less mimics what is being done by automake with the Makefile_insert files
What we were doing before did not work because add_directories() isn't able to 
propagate variables upwards.

(bzr r5397)

2 files changed, 2 insertions, 24 deletions

diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 5f0cea63b..503f9d0cc 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -18,20 +18,4 @@ xmlwriter.cpp
 xpathimpl.cpp
 xpathparser.cpp
 xpathtoken.cpp
-${dom_io_SRC}
-${dom_odf_SRC}
-${dom_util_SRC}
-${dom_work_SRC}
 )
-# Add New folders in src folder here
-SET(domfolders
-io
-odf
-util
-work
-)
-

-FOREACH(domdirlist ${domfolders})
-ADD_SUBDIRECTORY(${domdirlist})
-ENDFOREACH(domdirlist)
-
diff --git a/src/dom/odf/CMakeLists.txt b/src/dom/odf/CMakeLists.txt
index fd1e49b85..7a4b1ea4e 100644
--- a/src/dom/odf/CMakeLists.txt
+++ b/src/dom/odf/CMakeLists.txt
@@ -1,11 +1,5 @@
 SET(dom_odf_SRC
-base64stream.cpp
-bufferstream.cpp
-domstream.cpp
-gzipstream.cpp
-httpclient.cpp
-socket.cpp
-stringstream.cpp
-uristream.cpp
+odfdocument.cpp
+SvgOdg.cpp
 )