add CMakeFiles for io, jabber_whiteboard libavoid libcola.

(bzr r5245)

7 files changed, 331 insertions, 38 deletions

diff --git a/src/extension/dxf2svg/Makefile b/src/extension/dxf2svg/Makefile
index d0f06daf0..7a400d81c 100644
--- a/src/extension/dxf2svg/Makefile
+++ b/src/extension/dxf2svg/Makefile
@@ -1,21 +1,107 @@
-objs = read_dxf.o entities.o entities2elements.o tables.o tables2svg_info.o blocks.o
-flags = -O1
-
-dxf2svg : dxf2svg.cpp $(objs)
-	g++ $(flags) -o dxf2svg dxf2svg.cpp $(objs)
-
-test : test_dxf.cpp $(objs)
-	g++ $(flags) -o test test_dxf.cpp $(objs)
-	
-%.o : %.cpp %.h 
-	g++ $(flags) -c $<
-	
-clean :
-	rm dxf2svg $(objs)
-
-install:
-	echo ****User intervention required****
-	echo
-	echo Copy dxf2svg executable and dxf2svg.inx to share/extension directory
-	echo Make sure file permissions are set correctly
-	
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "MinGW Makefiles" Generator, CMake Version 2.4
+
+# Default target executed when no arguments are given to make.
+default_target: all
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canoncical targets will work.
+.SUFFIXES:
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+
+#=============================================================================
+# Set environment variables for the build.
+
+SHELL = cmd.exe
+
+# The CMake executable.
+CMAKE_COMMAND = "C:\Program Files\CMake 2.4\bin\cmake.exe"
+
+# The command to remove a file.
+RM = "C:\Program Files\CMake 2.4\bin\cmake.exe" -E remove -f
+
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = C:\PROGRA~1\CMAKE2~1.4\bin\CMAKES~1.EXE
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = C:\inkscape
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = C:\inkscape
+
+# Include the progress variables for this target.
+include CMakeFiles/progress.make
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	cd C:\inkscape\src\extension\dxf2svg && "C:\Program Files\CMake 2.4\bin\CMakeSetup.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	cd C:\inkscape\src\extension\dxf2svg && "C:\Program Files\CMake 2.4\bin\cmake.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+
+# The main all target
+all: cmake_check_build_system
+	cd C:\inkscape && $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles $(CMAKE_ALL_PROGRESS)
+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/all
+	$(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles 0
+
+# The main clean target
+clean:
+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/clean
+
+# The main clean target
+clean/fast: clean
+
+# Prepare targets for installation.
+preinstall: all
+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/extension/dxf2svg/preinstall
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1
+
+# Help Target
+help::
+	@$(CMAKE_COMMAND) -E echo "The following are some of the valid targets for this Makefile:"
+	@$(CMAKE_COMMAND) -E echo "... all (the default if no target is provided)"
+	@$(CMAKE_COMMAND) -E echo "... clean"
+	@$(CMAKE_COMMAND) -E echo "... depend"
+	@$(CMAKE_COMMAND) -E echo "... edit_cache"
+	@$(CMAKE_COMMAND) -E echo "... rebuild_cache"
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd C:\inkscape && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0
+
diff --git a/src/graphlayout/makefile b/src/graphlayout/makefile
index 5d8ac906e..27a0313cc 100644
--- a/src/graphlayout/makefile
+++ b/src/graphlayout/makefile
@@ -1,17 +1,107 @@
-# Convenience stub makefile to call the real Makefile.
-
-
-
-# Explicit so that it's the default rule.
-all:
-	cd .. && $(MAKE) graphlayout/all
-
-clean %.a %.o:
-	cd .. && $(MAKE) graphlayout/$@
-
-.PHONY: all clean
-
-OBJEXT = o
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
+# CMAKE generated file: DO NOT EDIT!

+# Generated by "MinGW Makefiles" Generator, CMake Version 2.4

+

+# Default target executed when no arguments are given to make.

+default_target: all

+

+#=============================================================================

+# Special targets provided by cmake.

+

+# Disable implicit rules so canoncical targets will work.

+.SUFFIXES:

+

+.SUFFIXES: .hpux_make_needs_suffix_list

+

+# Suppress display of executed commands.

+$(VERBOSE).SILENT:

+

+# A target that is always out of date.

+cmake_force:

+

+#=============================================================================

+# Set environment variables for the build.

+

+SHELL = cmd.exe

+

+# The CMake executable.

+CMAKE_COMMAND = "C:\Program Files\CMake 2.4\bin\cmake.exe"

+

+# The command to remove a file.

+RM = "C:\Program Files\CMake 2.4\bin\cmake.exe" -E remove -f

+

+# The program to use to edit the cache.

+CMAKE_EDIT_COMMAND = C:\PROGRA~1\CMAKE2~1.4\bin\CMAKES~1.EXE

+

+# The top-level source directory on which CMake was run.

+CMAKE_SOURCE_DIR = C:\inkscape

+

+# The top-level build directory on which CMake was run.

+CMAKE_BINARY_DIR = C:\inkscape

+

+# Include the progress variables for this target.

+include CMakeFiles/progress.make

+

+#=============================================================================

+# Targets provided globally by CMake.

+

+# Special rule for the target edit_cache

+edit_cache:

+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."

+	cd C:\inkscape\src\graphlayout && "C:\Program Files\CMake 2.4\bin\CMakeSetup.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

+

+# Special rule for the target edit_cache

+edit_cache/fast: edit_cache

+

+# Special rule for the target rebuild_cache

+rebuild_cache:

+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."

+	cd C:\inkscape\src\graphlayout && "C:\Program Files\CMake 2.4\bin\cmake.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)

+

+# Special rule for the target rebuild_cache

+rebuild_cache/fast: rebuild_cache

+

+# The main all target

+all: cmake_check_build_system

+	cd C:\inkscape && $(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles $(CMAKE_ALL_PROGRESS)

+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/all

+	$(CMAKE_COMMAND) -E cmake_progress_start C:\inkscape\CMakeFiles 0

+

+# The main clean target

+clean:

+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/clean

+

+# The main clean target

+clean/fast: clean

+

+# Prepare targets for installation.

+preinstall: all

+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/preinstall

+

+# Prepare targets for installation.

+preinstall/fast:

+	cd C:\inkscape && $(MAKE) -f CMakeFiles/Makefile2 src/graphlayout/preinstall

+

+# clear depends

+depend:

+	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 1

+

+# Help Target

+help::

+	@$(CMAKE_COMMAND) -E echo "The following are some of the valid targets for this Makefile:"

+	@$(CMAKE_COMMAND) -E echo "... all (the default if no target is provided)"

+	@$(CMAKE_COMMAND) -E echo "... clean"

+	@$(CMAKE_COMMAND) -E echo "... depend"

+	@$(CMAKE_COMMAND) -E echo "... edit_cache"

+	@$(CMAKE_COMMAND) -E echo "... rebuild_cache"

+

+

+

+#=============================================================================

+# Special targets to cleanup operation of make.

+

+# Special rule to run CMake to check the build system integrity.

+# No rule that depends on this can have commands that come from listfiles

+# because they might be regenerated.

+cmake_check_build_system:

+	cd C:\inkscape && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles\Makefile.cmake 0

+

diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
new file mode 100644
index 000000000..5b19b8d34
--- /dev/null
+++ b/src/io/CMakeLists.txt
@@ -0,0 +1,23 @@
+SET(io_SRC

+base64stream.cpp

+base64stream.h

+ftos.cpp

+ftos.h

+gzipstream.cpp

+gzipstream.h

+inkscapestream.cpp

+inkscapestream.h

+resource.cpp

+resource.h

+simple-sax.cpp

+simple-sax.h

+streamtest.cpp

+stringstream.cpp

+stringstream.h

+sys.cpp

+sys.h

+uristream.cpp

+uristream.h

+xsltstream.cpp

+xsltstream.h

+)
\ No newline at end of file
diff --git a/src/jabber_whiteboard/CMakeLists.txt b/src/jabber_whiteboard/CMakeLists.txt
new file mode 100644
index 000000000..bc3b42157
--- /dev/null
+++ b/src/jabber_whiteboard/CMakeLists.txt
@@ -0,0 +1,43 @@
+SET(jabber_whiteboard_SRC

+defines.cpp

+defines.h

+empty.cpp

+inkboard-document.cpp

+inkboard-document.h

+inkboard-node.cpp

+invitation-confirm-dialog.cpp

+invitation-confirm-dialog.h

+keynode.cpp

+keynode.h

+message-aggregator.cpp

+message-aggregator.h

+message-node.h

+message-queue.cpp

+message-queue.h

+message-tags.cpp

+message-tags.h

+message-utilities.cpp

+message-utilities.h

+message-verifier.h

+node-tracker.cpp

+node-tracker.h

+node-utilities.cpp

+node-utilities.h

+pedrogui.cpp

+pedrogui.h

+session-file-selector.cpp

+session-file-selector.h

+session-manager.cpp

+session-manager.h

+tracker-node.h

+${jabber_whiteboard_dialog_SRC}

+)

+

+# Add New folders in src folder here

+SET(jabber_whiteboardfolders

+dialog

+)

+

+FOREACH(jabber_whiteboarddirlist ${jabber_whiteboardfolders})

+ADD_SUBDIRECTORY(${jabber_whiteboarddirlist})

+ENDFOREACH(jabber_whiteboarddirlist)
\ No newline at end of file
diff --git a/src/jabber_whiteboard/dialog/CMakeLists.txt b/src/jabber_whiteboard/dialog/CMakeLists.txt
new file mode 100644
index 000000000..61befc616
--- /dev/null
+++ b/src/jabber_whiteboard/dialog/CMakeLists.txt
@@ -0,0 +1,4 @@
+SET(jabber_whiteboard_dialog_SRC

+choose-desktop.cpp

+choose-desktop.h

+)
\ No newline at end of file
diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
new file mode 100644
index 000000000..e2530c183
--- /dev/null
+++ b/src/libavoid/CMakeLists.txt
@@ -0,0 +1,30 @@
+SET(libavoid_SRC

+connector.cpp

+connector.h

+debug.h

+geometry.cpp

+geometry.h

+geomtypes.h

+graph.cpp

+graph.h

+libavoid.h

+makepath.cpp

+makepath.h

+polyutil.cpp

+polyutil.h

+region.cpp

+region.h

+router.cpp

+router.h

+shape.cpp

+shape.h

+static.cpp

+static.h

+timer.cpp

+timer.h

+vertices.cpp

+vertices.h

+visibility.cpp

+visibility.h

+)

+ADD_LIBRARY(inklibavoid STATIC ${libavoid_SRC})

diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
new file mode 100644
index 000000000..04005fde4
--- /dev/null
+++ b/src/libcola/CMakeLists.txt
@@ -0,0 +1,17 @@
+SET(libcola_SRC

+cola.cpp

+cola.h

+conjugate_gradient.cpp

+conjugate_gradient.h

+connected_components.cpp

+cycle_detector.cpp

+cycle_detector.h

+defs.h

+gradient_projection.cpp

+gradient_projection.h

+shortest_paths.cpp

+shortest_paths.h

+straightener.cpp

+straightener.h

+)

+ADD_LIBRARY(inklibcola STATIC ${libcola_SRC})
\ No newline at end of file